Merge remote-tracking branch 'origin/develop' into develop

# Conflicts: # .idea/workspace.xml

Merge remote-tracking branch 'origin/develop' into develop
# Conflicts: # .idea/workspace.xml
xqs
2 parents 751bd7c0 3ba24807
Showing 2 changed files with 101 additions and 10 deletions
src/main/java/com/huaheng/pc/config/materialMultiple/controller/MaterialMultipleController.java
src/main/java/com/huaheng/pc/inventory/inventoryDetail/controller/InventoryDetailController.java
@@ -9,15 +9,13 @@ import com.huaheng.common.utils.StringUtils;
 import com.huaheng.common.utils.security.ShiroUtils;
 import com.huaheng.framework.aspectj.lang.annotation.Log;
 import com.huaheng.framework.aspectj.lang.constant.BusinessType;
+import com.huaheng.framework.web.controller.BaseController;
 import com.huaheng.framework.web.domain.AjaxResult;
 import com.huaheng.framework.web.page.PageDomain;
 import com.huaheng.framework.web.page.TableDataInfo;
 import com.huaheng.framework.web.page.TableSupport;
 import com.huaheng.pc.config.materialMultiple.domain.MaterialMultiple;
 import com.huaheng.pc.config.materialMultiple.service.MaterialMultipleService;
-import com.huaheng.pc.config.materialUnit.domain.MaterialUnit;
-import com.huaheng.pc.general.material.domain.Material;
-import com.huaheng.pc.general.material.service.MaterialService;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -31,17 +29,50 @@ import java.util.List;
 @Controller
 @RequestMapping("/config/materialMultiple")
-public class MaterialMultipleController {
+public class MaterialMultipleController extends BaseController {
     @Resource
     private MaterialMultipleService materialMultipleService;
     private String prefix = "config/materialMultiple";
-    @RequiresPermissions("config:materialUnit:view")
+    @RequiresPermissions("config:materialMultiple:view")
     @GetMapping()
-    public String materialUnit() {
-        return prefix + "/materialUnit";
+    public String materialMultiple() {
+        return prefix + "/materialMultiple";
+    }
+
+    /**
+     * 查询单位转换列表
+     */
+    @ApiOperation(value="查看单位转换列表", notes="根据物料编码、名称、创建时间获取单位转换列表", httpMethod = "POST")
+    @RequiresPermissions("config:materialMultiple:list")
+    @Log(title = "配置-单位转换",operating = "单位转换列表", action = BusinessType.GRANT)
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(@ApiParam(name="receiptType",value="物料编码、名称") MaterialMultiple materialMultiple,
+                              @ApiParam(name = "createdBegin", value = "起止时间") String createdBegin,
+                              @ApiParam(name = "createdEnd", value = "结束时间") String createdEnd) {
+        LambdaQueryWrapper<MaterialMultiple> lambdaQueryWrapper = Wrappers.lambdaQuery();
+        PageDomain pageDomain = TableSupport.buildPageRequest();
+        Integer pageNum = pageDomain.getPageNum();
+        Integer pageSize = pageDomain.getPageSize();
+        lambdaQueryWrapper.gt(StringUtils.isNotEmpty(createdBegin), MaterialMultiple::getCreated, createdBegin)
+                .lt(StringUtils.isNotEmpty(createdEnd), MaterialMultiple::getCreated, createdEnd)
+                .eq(StringUtils.isNotEmpty(materialMultiple.getMaterialCode()), MaterialMultiple::getMaterialCode, materialMultiple.getMaterialCode())
+                .eq(StringUtils.isNotEmpty(materialMultiple.getMaterialName()), MaterialMultiple::getMaterialName, materialMultiple.getMaterialName())
+                .in(MaterialMultiple::getCompanyCode, ShiroUtils.getCompanyCodeList())
+                .eq(MaterialMultiple::getWarehouseCode, ShiroUtils.getWarehouseCode());
+
+        if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){
+            /*使用分页查询*/
+            Page<MaterialMultiple> page = new Page<>(pageNum, pageSize);
+            IPage<MaterialMultiple> iPage = materialMultipleService.page(page, lambdaQueryWrapper);
+            return getMpDataTable(iPage.getRecords(), iPage.getTotal());
+        } else {
+            List<MaterialMultiple> list = materialMultipleService.list(lambdaQueryWrapper);
+            return getDataTable(list);
+        }
     }
     /**
@@ -52,5 +83,68 @@ public class MaterialMultipleController {
         return prefix + "/add";
     }
+    /**
+     * 新增保存单位转换
+     */
+    @ApiOperation(value="新增单位转换", notes="新增单位转换", httpMethod = "POST")
+    @RequiresPermissions("config:materialMultiple:add")
+    @Log(title = "配置-单位转换",operating = "新增单位转换", action = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult addSave(MaterialMultiple materialMultiple) {
+        LambdaQueryWrapper<MaterialMultiple> lambda = Wrappers.lambdaQuery();
+        lambda.eq(MaterialMultiple::getCompanyCode,materialMultiple.getCompanyCode())
+                .eq(MaterialMultiple::getMaterialCode, materialMultiple)
+                .eq(MaterialMultiple::getWarehouseCode, ShiroUtils.getWarehouseCode())
+                .eq(MaterialMultiple::getUnitId1, materialMultiple.getUnitId1())
+                .eq(MaterialMultiple::getUnitId2, materialMultiple.getUnitId2());
+        if (materialMultipleService.list(lambda) == null){
+            return AjaxResult.error("该信息已存在");
+        }
+        materialMultiple.setCreatedBy(ShiroUtils.getLoginName());
+        materialMultiple.setLastUpdatedBy(ShiroUtils.getLoginName());
+        return toAjax(materialMultipleService.save(materialMultiple));
+    }
+    /**
+     * 修改单位转换
+     */
+    @GetMapping("/edit/{id}")
+    public String edit(@PathVariable("id") Integer id, ModelMap mmap) {
+        MaterialMultiple materialMultiple = materialMultipleService.getById(id);
+        mmap.put("materialMultiple", materialMultiple);
+        return prefix + "/edit";
+    }
+
+    /**
+     * 修改保存单位转换
+     */
+    @ApiOperation(value="修改单位转换信息", notes="修改单位转换信息", httpMethod = "POST")
+    @RequiresPermissions("config:warehouse:edit")
+    @Log(title = "配置-单位转换",operating = "修改单位转换", action = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(MaterialMultiple materialMultiple) {
+        materialMultiple.setLastUpdatedBy(ShiroUtils.getLoginName());
+        return toAjax(materialMultipleService.updateById(materialMultiple));
+    }
+
+    /**
+     * 删除单位转换
+     */
+    @ApiOperation(value="删除单位转换", notes="单条删除或批量删除单位转换，示例1或1,2,3", httpMethod = "POST")
+    @RequiresPermissions("config:receiptType:remove")
+    @Log(title = "配置-单位转换",operating = "删除单位转换", action = BusinessType.DELETE)
+    @PostMapping( "/remove")
+    @ResponseBody
+    public AjaxResult remove(String ids) {
+        if (StringUtils.isEmpty(ids)) {
+            return AjaxResult.error("id不能为空");
+        }
+        List<Integer> list = new ArrayList<>();
+        for (Integer id : Convert.toIntArray(ids)) {
+            list.add(id);
+        }
+        return toAjax(materialMultipleService.removeByIds(list));
+    }
 }
@@ -9,16 +9,13 @@ import com.huaheng.common.utils.security.ShiroUtils;
 import com.huaheng.framework.aspectj.lang.annotation.Log;
 import com.huaheng.framework.aspectj.lang.constant.BusinessType;
 import com.huaheng.framework.web.controller.BaseController;
-import com.huaheng.framework.web.domain.AjaxResult;
 import com.huaheng.framework.web.page.PageDomain;
 import com.huaheng.framework.web.page.TableDataInfo;
 import com.huaheng.framework.web.page.TableSupport;
 import com.huaheng.pc.general.material.service.MaterialServiceImpl;
 import com.huaheng.pc.inventory.inventoryDetail.domain.InventoryDetail;
 import com.huaheng.pc.inventory.inventoryDetail.service.InventoryDetailService;
-import com.huaheng.pc.inventory.inventoryHeader.domain.InventoryHeader;
 import com.huaheng.pc.inventory.inventoryHeader.service.InventoryHeaderService;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;