fix: 库存物料汇总BUG修复

pengyongcheng
1 parent 6045c5f9
Showing 3 changed files with 65 additions and 5 deletions
src/main/java/com/huaheng/pc/inventory/InventoryMaterialSummary/controller/InventoryMaterialSummaryController.java
src/main/resources/templates/inventory/inventoryHeader/cbgReplenish.html
src/main/resources/templates/inventory/inventoryMaterialSummary/inventoryMaterialSummary.html
 package com.huaheng.pc.inventory.InventoryMaterialSummary.controller;
  
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 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.page.PageDomain;
 import com.huaheng.framework.web.page.TableDataInfo;
+import com.huaheng.framework.web.page.TableSupport;
 import com.huaheng.pc.config.company.domain.Company;
 import com.huaheng.pc.config.company.service.CompanyService;
 import com.huaheng.pc.inventory.InventoryMaterialSummary.domain.InventoryMaterialSummary;
@@ -60,7 +65,7 @@ public class InventoryMaterialSummaryController extends BaseController {
     /**
      * 库存汇总列表
      */
-    @RequiresPermissions("inventory:cycleCountDetail:list")
+    /*@RequiresPermissions("inventory:cycleCountDetail:list")
     @PostMapping("/list")
     @Log(title = "库存-库存汇总", operating = "库存汇总主表", action = BusinessType.GRANT)
     @ResponseBody
@@ -89,13 +94,48 @@ public class InventoryMaterialSummaryController extends BaseController {
         }
         //筛选库存汇总数据的专用方法
         return inventoryMaterialSummaryService.duplicateRemoval(list);
+    }*/
+
+    /**
+     * 库存汇总列表
+     */
+    @RequiresPermissions("inventory:cycleCountDetail:list")
+    @PostMapping("/list")
+    @Log(title = "库存-库存汇总", operating = "库存汇总主表", action = BusinessType.GRANT)
+    @ResponseBody
+    public TableDataInfo list(InventoryDetail inventoryDetail, String createdBegin, String createdEnd) {
+        if (StringUtils.isNotEmpty(createdEnd)) {
+            createdEnd = LocalDate.parse(createdEnd).plusDays(1).toString();
+        }
+        PageDomain pageDomain = TableSupport.buildPageRequest();
+        Integer pageNum = pageDomain.getPageNum();
+        Integer pageSize = pageDomain.getPageSize();
+        QueryWrapper<InventoryDetail> queryWrapper = Wrappers.query();
+        queryWrapper
+                .select("zoneCode, companyCode, materialCode, materialName, materialUnit, SUM(qty) as qty")
+                .ge(StringUtils.isNotEmpty(createdBegin), "created", createdBegin)
+                .lt(StringUtils.isNotEmpty(createdEnd), "created", createdEnd)
+                .eq(StringUtils.isNotEmpty(inventoryDetail.getZoneCode()), "zoneCode", inventoryDetail.getZoneCode())
+                .eq(StringUtils.isNotEmpty(inventoryDetail.getMaterialCode()), "materialCode", inventoryDetail.getMaterialCode())
+                .eq(StringUtils.isNotEmpty(inventoryDetail.getMaterialName()), "materialName", inventoryDetail.getMaterialName())
+                .eq(StringUtils.isNotEmpty(inventoryDetail.getOrderCode()), "orderCode", inventoryDetail.getOrderCode());
+        queryWrapper.groupBy("zoneCode", "companyCode", "materialCode", "materialName", "materialUnit");
+        if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)) {
+            //分页查询
+            Page<InventoryDetail> page = new Page<>(pageNum, pageSize);
+            IPage<InventoryDetail> iPage = inventoryDetailService.page(page, queryWrapper);
+            return getMpDataTable(iPage.getRecords(), iPage.getTotal());
+        } else {
+            List<InventoryDetail> list = inventoryDetailService.list(queryWrapper);
+            return getDataTable(list);
+        }
     }
  
  
     /**
      * 库存汇总子单列表
      */
-    @PostMapping("/inventoryMaterialSummaryChild")
+    /*@PostMapping("/inventoryMaterialSummaryChild")
     @Log(title = "库存-库存汇总", operating = "库存汇总明细子单", action = BusinessType.GRANT)
     @ResponseBody
     public TableDataInfo inventoryMaterialSummaryChild(InventoryMaterialSummary inventoryMaterialSummaryChild) {
@@ -113,6 +153,22 @@ public class InventoryMaterialSummaryController extends BaseController {
         }
         return getDataTable(list);
  
+    }*/
+
+    @PostMapping("/inventoryMaterialSummaryChild")
+    @Log(title = "库存-库存汇总", operating = "库存汇总明细子单", action = BusinessType.GRANT)
+    @ResponseBody
+    public TableDataInfo inventoryMaterialSummaryChild(InventoryDetail inventoryDetail) {
+        LambdaQueryWrapper<InventoryMaterialSummary> lambdaQueryWrapper = Wrappers.lambdaQuery();
+        lambdaQueryWrapper
+                .eq(InventoryMaterialSummary::getMaterialCode, inventoryDetail.getMaterialCode())
+                .eq(StringUtils.isNotEmpty(inventoryDetail.getZoneCode()), InventoryMaterialSummary::getZoneCode, inventoryDetail.getZoneCode());
+        List<InventoryMaterialSummary> list = inventoryMaterialSummaryService.list(lambdaQueryWrapper);
+        if (list == null) {
+            list = Collections.emptyList();
+        }
+        return getDataTable(list);
+
     }
  
     /**
@@ -26,7 +26,7 @@
         <div class="form-group">
             <label class="col-sm-3 control-label">上料口：</label>
             <div class="col-sm-8">
-                <select id="fromPort" name="fromPort" class="form-control">
+                <select id="fromPort" name="fromPort" class="form-control" disabled>
                     <option>请选择上料口</option>
                     <option th:each="item : ${stations}"
                             th:text="${item['name']}"
@@ -23,10 +23,10 @@
                             <label>物料编码：</label>
                             <input id="materialCode" name="materialCode" placeholder="请输入物料编码" type="text"/>
                         </li>
-                        <li>
+                       <!-- <li>
                             <label>固化时间(h)：</label>
                             <input name="solidifyTime" min="0" placeholder="请输入固化时间(h)" type="number"/>
-                        </li>
+                        </li>-->
                         <li>
                             <label>所属工单号：</label>
                             <input name="orderCode" placeholder="请输入工单号" type="text"/>
@@ -215,6 +215,10 @@
                     title: '物料名称'
                 },
                 {
+                    field: 'flowCode',
+                    title: '工序号'
+                },
+                {
                     field: 'materialSpec',
                     title: '物料规格'
                 },