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

mahuandong
2 parents 1cfc91c5 9c93338f
Showing 13 changed files with 81 additions and 39 deletions
src/main/java/com/huaheng/pc/receipt/receiptDetail/controller/ReceiptDetailController.java
src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailService.java
src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailServiceImpl.java
src/main/java/com/huaheng/pc/system/user/controller/IndexController.java
src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java
src/main/resources/application.yml
src/main/resources/mybatis/task/TaskHeaderMapper.xml
src/main/resources/templates/config/company/add.html
src/main/resources/templates/config/company/edit.html
src/main/resources/templates/inventory/inventoryDetail/inventoryDetail.html
src/main/resources/templates/receipt/receiptDetail/add.html
src/main/resources/templates/receipt/receiptDetail/receiptDetail.html
src/main/resources/templates/receipt/receiptHeader/receiptHeader.html
@@ -120,7 +120,9 @@ public class ReceiptDetailController extends BaseController {
     @PostMapping("/add")
     @ResponseBody
     public AjaxResult addSave(ReceiptDetail receiptDetail) {
-       return receiptDetailService.saveReceiptDetaial(receiptDetail);
+        AjaxResult ajaxResult =  receiptDetailService.saveReceiptDetaial(receiptDetail);
+        receiptDetailService.updateReceiptHeader(receiptHeaderService.getById(receiptDetail.getReceiptId()));
+        return ajaxResult;
     }
  
     /**
@@ -143,7 +145,9 @@ public class ReceiptDetailController extends BaseController {
     @ResponseBody
     public AjaxResult editSave(
             @ApiParam(name="receiptDetail",value="入库详情") ReceiptDetail receiptDetail) {
-        return receiptDetailService.updateReceiptDetaial(receiptDetail);
+        AjaxResult ajaxResult =  receiptDetailService.updateReceiptDetaial(receiptDetail);
+        receiptDetailService.updateReceiptHeader(receiptHeaderService.getById(receiptDetail.getReceiptId()));
+        return ajaxResult;
     }
  
     /**
@@ -162,7 +166,11 @@ public class ReceiptDetailController extends BaseController {
         for (Integer id : Convert.toIntArray(ids)){
             list.add(id);
         }
-        return toAjax(receiptDetailService.removeByIds(list));
+        ReceiptDetail receiptDetail  = receiptDetailService.getById(list.get(0));
+        ReceiptHeader receiptHeader = receiptHeaderService.getById(receiptDetail.getReceiptId());
+        AjaxResult ajaxResult =  toAjax(receiptDetailService.removeByIds(list));
+        receiptDetailService.updateReceiptHeader(receiptHeader);
+        return ajaxResult;
     }
  
     /**
@@ -4,6 +4,7 @@ import com.huaheng.framework.web.domain.AjaxResult;
 import com.huaheng.mobile.receipt.ReceiptBill;
 import com.huaheng.pc.receipt.receiptDetail.domain.ReceiptDetail;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.huaheng.pc.receipt.receiptHeader.domain.ReceiptHeader;
 import com.huaheng.pc.task.taskDetail.domain.TaskDetail;
  
 import java.util.List;
@@ -49,4 +50,6 @@ public interface ReceiptDetailService extends IService&lt;ReceiptDetail&gt;{
     AjaxResult scanReceiptCode(String code, String type, String companyCode);
  
     List<Integer> insertTodayReceiptDetail(int headerId, List<ReceiptBill> receiptBills, boolean isCompletedQty, String companyCode);
+
+    AjaxResult  updateReceiptHeader(ReceiptHeader receiptHeader);
 }
@@ -35,6 +35,7 @@ import io.swagger.models.auth.In;
 import org.aspectj.weaver.loadtime.Aj;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -135,7 +136,6 @@ public class ReceiptDetailServiceImpl extends ServiceImpl&lt;ReceiptDetailMapper, R
  
         //查询原记录
         ReceiptDetail originalReceiptDetail= this.getById(receiptDetail.getId());
-        ReceiptHeader receiptHeader = receiptHeaderService.getById(receiptDetail.getReceiptId());
         //判断物料编码是否被修改
         if (!originalReceiptDetail.getMaterialCode().equals(receiptDetail.getMaterialCode())){
             LambdaQueryWrapper<Material> lambdaMaterial = Wrappers.lambdaQuery();
@@ -149,11 +149,6 @@ public class ReceiptDetailServiceImpl extends ServiceImpl&lt;ReceiptDetailMapper, R
                 receiptDetail.setMaterialSpec(material.getSpec());
                 receiptDetail.setMaterialUnit(material.getUnit());
                 receiptDetail.setProcessStamp("0");
-                receiptHeader.setTotalQty(receiptHeader.getTotalQty().subtract(originalReceiptDetail.getTotalQty()));
-                receiptHeader.setTotalLines(receiptHeader.getTotalLines()-1);
-                if ( !receiptHeaderService.updateById(receiptHeader)){
-                    return AjaxResult.error("入库头表更新失败");
-                }
             }
         }
  
@@ -166,13 +161,29 @@ public class ReceiptDetailServiceImpl extends ServiceImpl&lt;ReceiptDetailMapper, R
             return AjaxResult.error("入库明细更新失败");
         } else {
  
-            receiptHeader.setTotalQty(receiptHeader.getTotalQty().add(receiptDetail.getTotalQty()));
-            receiptHeader.setTotalLines(receiptHeader.getTotalLines()+1);
-            receiptHeaderService.updateById(receiptHeader);
             return AjaxResult.success("修改单据明细成功");
         }
     }
  
+    @Override
+    public AjaxResult  updateReceiptHeader(ReceiptHeader receiptHeader) {
+        BigDecimal totalQty = new BigDecimal(0);
+        int totalLines = 0;
+        LambdaQueryWrapper<ReceiptDetail> receiptDetailLambdaQueryWrapper = Wrappers.lambdaQuery();
+        receiptDetailLambdaQueryWrapper.eq(ReceiptDetail::getReceiptId,receiptHeader.getId());
+        List<ReceiptDetail> receiptDetailList =  list(receiptDetailLambdaQueryWrapper);
+        for(ReceiptDetail receiptDetail : receiptDetailList) {
+            totalLines++;
+            totalQty = totalQty.add(receiptDetail.getTotalQty());
+        }
+        receiptHeader.setTotalQty(totalQty);
+        receiptHeader.setTotalLines(totalLines);
+        if (!receiptHeaderService.updateById(receiptHeader)){
+            return AjaxResult.error("入库头表更新失败");
+        }
+        return AjaxResult.success("入库头表更新成功");
+    }
+
     /**
      * 根据流程配置更新入库明细下一流程
      * @param receiptDetail
@@ -104,7 +104,7 @@ public class IndexController extends BaseController
         String shipmentTotal = "SELECT IFNULL(SUM(d.qty),0) 'total' from shipment_container_detail d JOIN shipment_container_header h on d.shippingContainerId = h.id WHERE DATEDIFF(NOW(), h.created) = 0 AND h.status > 19 AND h.warehouseCode = '"+ShiroUtils.getWarehouseCode()+"' ;";
         String inventoryTotal = "SELECT IFNULL(SUM(totalQty),0) 'total' from inventory_header where 1=1 " + condition;
         String materialCount = "SELECT count(DISTINCT materialSkuQty) 'total' from inventory_header WHERE 1=1" + condition;
-        String taskUncompletedTotal = "SELECT COUNT(*) 'total' from task_detail WHERE status < 40 " + condition;
+        String taskUncompletedTotal = "SELECT COUNT(*) 'total' from task_detail WHERE status < 100 " + condition;
  
         Map<String, Object> map = new HashMap<>();
         List<LinkedHashMap<String, Object>> temp1 = mapper.selectCommon(bllCount);
@@ -752,7 +752,10 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
                         .eq(InventoryDetail::getLocationCode, task.getToLocation())
                         .eq(InventoryDetail::getMaterialCode, DataUtils.getString(map.get("materialCode")))
                         .eq(InventoryDetail::getContainerCode, DataUtils.getString(map.get("containerCode")))
-                        .eq(InventoryDetail::getContainerCode, DataUtils.getString(map.get("batch")));
+                        .eq(InventoryDetail::getBatch, DataUtils.getString(map.get("batch")))
+                        .eq(InventoryDetail::getLot, DataUtils.getString(map.get("lot")))
+                        .eq(InventoryDetail::getProjectNo, DataUtils.getString(map.get("projectNo")))
+                        .eq(InventoryDetail::getCompanyCode, DataUtils.getString(map.get("companyCode")));
                 InventoryDetail detail = inventoryDetailService.getOne(inventory);
                 if (detail == null) {
                     //库存明细添加
@@ -770,6 +773,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
                     detail.setReceiptDetailId(DataUtils.getInteger(map.get("receiptDetailId")));//入库单明细ID
                     detail.setBatch(DataUtils.getString(map.get("batch")));//批次
                     detail.setLot(DataUtils.getString(map.get("lot")));//批号
+                    detail.setProjectNo(DataUtils.getString(map.get("projectNo")));//项目号
                     detail.setInventorySts(DataUtils.getString(map.get("inventorySts")));//库存状态
 //                    detail.setManufactureDate(new SimpleDateFormat("yyyy-MM-dd").parse(map.get("manufactureDate").toString()));//生产日期
 //                    detail.setExpirationDate(new SimpleDateFormat("yyyy-MM-dd").parse(map.get("expirationDate").toString()));//失效日期
@@ -907,21 +911,33 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
             List<InventoryDetail> inventoryDetailList = inventoryDetailService.list(inventory);
             for(int i=0; i < inventoryDetailList.size() -1; i++) {
                 for(int j = inventoryDetailList.size() - 1; j > i; j--) {
-                    if(inventoryDetailList.get(i).getMaterialCode().equals(inventoryDetailList.get(j).getMaterialCode())) {
+                    InventoryDetail inventoryDetail = inventoryDetailList.get(i);
+                    InventoryDetail inventoryDetail2 = inventoryDetailList.get(j);
+                    if(inventoryDetail.getMaterialCode().equals(inventoryDetail2.getMaterialCode())
+                            && inventoryDetail.getBatch().equals(inventoryDetail2.getBatch())
+                            && inventoryDetail.getLot().equals(inventoryDetail2.getLot())
+                            && inventoryDetail.getProjectNo().equals(inventoryDetail2.getProjectNo())) {
                         BigDecimal totalQty = inventoryDetailList.get(i).getQty().add(inventoryDetailList.get(j).getQty());
                         inventoryDetailList.get(i).setQty(totalQty);
-                        inventoryDetailList.remove(j);
                         LambdaQueryWrapper<InventoryDetail> wrapper = Wrappers.lambdaQuery();
                         wrapper.eq(InventoryDetail::getId, inventoryDetailList.get(i).getId());
                         inventoryDetailService.update(inventoryDetailList.get(i), wrapper);
+                        LambdaQueryWrapper<InventoryDetail> wrapper2 = Wrappers.lambdaQuery();
+                        wrapper2.eq(InventoryDetail::getId, inventoryDetailList.get(j).getId());
+                        inventoryDetailService.remove(wrapper2);
+                        inventoryDetailList.remove(j);
                     }
                 }
             }
             BigDecimal totalQty = new BigDecimal(0);
+            int totalLines = 0;
             for(InventoryDetail inventoryDetail : inventoryDetailList) {
                  totalQty = totalQty.add(inventoryDetail.getQty());
+                 totalLines++;
             }
             header.setTotalQty(totalQty);
+            header.setTotalLines(totalLines);
+            header.setContainerStatus("some");
             LambdaQueryWrapper<InventoryHeader> wrapper = Wrappers.lambdaQuery();
             wrapper.eq(InventoryHeader::getId, header.getId());
             inventoryHeaderService.update(header, wrapper);
@@ -1593,6 +1609,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
                         taskDetail.setFromLocation(task.getFromLocation());
                         taskDetail.setLastUpdatedBy(ShiroUtils.getLoginName());
                         taskDetail.setBatch(item.getBatch());
+                        taskDetail.setProjectNo(item.getProjectNo());
                         if (containerCapacity != null) {
                             conatinQty += (int) Math.floor(item.getQty().intValue() / containerCapacity.getQty().intValue());
                             taskDetail.setContainQty((int) Math.floor(item.getQty().intValue() / containerCapacity.getQty().intValue()));
@@ -71,9 +71,9 @@ spring:
   servlet:
     multipart:
       # 单个文件大小
-      max-file-size:  30MB
+      max-file-size:  100MB
       # 设置总上传的文件大小
-      max-request-size:  30MB
+      max-request-size:  100MB
   # 服务模块
   devtools:
     restart:
@@ -48,7 +48,7 @@
    SELECT rd.id receiptDetailId,rd.receiptId,td.taskId, td.warehouseCode, td.id taskDetailId, td.status,
                  td.containerCode, td.qty, td.materialCode,rd.totalQty,td.materialSpec,
 					rd.receiptCode,rd.inventorySts,
-                 td.materialName, rd.batch, rd.lot,
+                 td.materialName, rd.batch, rd.lot, rd.projectNo,
                  rd.manufactureDate, rd.expirationDate
         FROM task_detail td
         INNER JOIN receipt_detail rd ON rd.id = td.billDetailId AND td.taskId = #{taskId,jdbcType=INTEGER}
@@ -2,6 +2,7 @@
 <html  lang="zh" xmlns:th="http://www.thymeleaf.org">
 <meta charset="utf-8">
 <head th:include="include :: header"></head>
+<link href="/ajax/libs/iCheck/custom.css" th:href="@{/ajax/libs/iCheck/custom.css}" rel="stylesheet"/>
 <body class="white-bg">
     <div class="wrapper wrapper-content animated fadeInRight ibox-content">
         <form class="form-horizontal m" id="form-company-add">
@@ -2,6 +2,7 @@
 <html  lang="zh" xmlns:th="http://www.thymeleaf.org">
 <meta charset="utf-8">
 <head th:include="include :: header"></head>
+<link href="/ajax/libs/iCheck/custom.css" th:href="@{/ajax/libs/iCheck/custom.css}" rel="stylesheet"/>
 <body class="white-bg">
     <div class="wrapper wrapper-content animated fadeInRight ibox-content">
         <form class="form-horizontal m" id="form-company-edit" th:object="${company}">
@@ -164,6 +164,18 @@
                     title: '库存数量'
                 },
                 {
+                    field: 'batch',
+                    title: '批次',
+                },
+                {
+                    field: 'lot',
+                    title: '批号',
+                },
+                {
+                    field: 'projectNo',
+                    title: '项目号',
+                },
+                {
                     field: 'inventorySts',
                     title: '库存状态',
                     align: 'center',
@@ -211,23 +223,6 @@
                     }
                 },
                 {
-                    field: 'batch',
-                    title: '批次',
-                    sortable: false,
-                    visible: false
-                },
-                {
-                    field: 'lot',
-                    title: '批号',
-                    sortable: false,
-                    visible: false
-                },
-                {
-                    field: 'projectNo',
-                    title: '项目号',
-                    sortable: true
-                },
-                {
                     field: 'supplierCode',
                     title: '供应商编码',
                     visible: true
@@ -174,7 +174,7 @@
                     "materialCode": $("input[name='materialCode']").val(),
                     "batch": $("input[name='batch']").val(),
                     "lot": $("input[name='lot']").val(),
-                    "project": $("input[name='project']").val(),
+                    "projectNo": $("input[name='projectNo']").val(),
                     "manufactureDate": $("input[name='manufactureDate']").val(),
                     "expirationDate": $("input[name='expirationDate']").val(),
                     "inventorySts": $("#inventorySts option:selected").val(),
@@ -108,7 +108,10 @@
                 {
                     field : 'lot',
                     title : '批号' ,
-                    visible:false
+                },
+                {
+                    field : 'projectNo',
+                    title : '项目号' ,
                 },
                 {
                     field : 'qcCheck',
@@ -519,7 +519,10 @@
             {
                 field : 'lot',
                 title : '批号' ,
-                visible:false
+            },
+            {
+                field : 'projectNo',
+                title : '项目号' ,
             },
             {
                 field : 'qcCheck',