添加入库明细中是否质检的判断

添加入库明细中判断入库流程

添加入库明细中是否质检的判断
添加入库明细中判断入库流程
mahuandong
1 parent 9919f1ed
Showing 8 changed files with 126 additions and 21 deletions
src/main/java/com/huaheng/pc/receipt/receiptDetail/domain/ReceiptDetail.java
src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailServiceImpl.java
src/main/java/com/huaheng/pc/receipt/receiptHeader/service/ReceiptHeaderService.java
src/main/java/com/huaheng/pc/receipt/receiptHeaderHistory/service/ReceiptHeaderHistoryService.java
src/main/resources/templates/config/receiptType/edit.html
src/main/resources/templates/receipt/receiptDetail/add.html
src/main/resources/templates/receipt/receiptDetail/edit.html
src/main/resources/templates/receipt/receiptHeader/receiptHeader.html
@@ -6,6 +6,8 @@ import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
+
+import io.swagger.annotations.ApiParam;
 import lombok.Data;
  
 @ApiModel(value = "com.huaheng.pc.receipt.receiptDetail.domain.ReceiptDetail")
@@ -341,4 +343,11 @@ public class ReceiptDetail implements Serializable {
     @ApiModelProperty(value = "是否删除")
     private Boolean deleted;
  
+    /**
+     * 流程编码
+     */
+    @TableField(value = "statusFlowCode")
+    @ApiModelProperty(value = "流程编码")
+    private String statusFlowCode;
+
 }
 \ No newline at end of file
@@ -7,6 +7,8 @@ import com.huaheng.common.support.Convert;
 import com.huaheng.common.utils.StringUtils;
 import com.huaheng.common.utils.security.ShiroUtils;
 import com.huaheng.framework.web.domain.AjaxResult;
+import com.huaheng.pc.check.checkHeader.domain.CheckHeader;
+import com.huaheng.pc.check.checkHeader.service.CheckHeaderService;
 import com.huaheng.pc.config.material.domain.Material;
 import com.huaheng.pc.config.material.service.MaterialService;
 import com.huaheng.pc.config.materialType.domain.MaterialType;
@@ -48,6 +50,8 @@ public class ReceiptDetailServiceImpl extends ServiceImpl&lt;ReceiptDetailMapper, R
     private ReceiptPreferenceService receiptPreferenceService;
     @Resource
     private IDictDataService dictDataService;
+    @Resource
+    private CheckHeaderService checkHeaderService;
  
     /**
      * 新增入库明细
@@ -163,6 +167,18 @@ public class ReceiptDetailServiceImpl extends ServiceImpl&lt;ReceiptDetailMapper, R
             return receiptDetail;
         }
  
+        //如果入库明细绑定了入库流程则从入库明细中选择流程
+        if ( StringUtils.isNotEmpty(receiptDetail.getStatusFlowCode())){
+            List<StatusFlowDetail> statusFlowDetails = statusFlowDetailService.queryStatusFlowDetail(receiptDetail.getStatusFlowCode());
+            String status = nextStatusFlow(statusFlowDetails, receiptDetail.getProcessStamp());
+            //在状态到达时候是判断是否要质检
+            if ("200".equals(status) && inspection(receiptDetail)){
+                receiptDetail.setProcessStamp("180");
+            } else {
+                receiptDetail.setProcessStamp(status);
+            }
+            return receiptDetail;
+        }
         //查询头表信息
         LambdaQueryWrapper<ReceiptHeader> lambdaReceiptHeader = Wrappers.lambdaQuery();
         lambdaReceiptHeader.eq(ReceiptHeader::getCode, receiptDetail.getReceiptCode());
@@ -183,13 +199,23 @@ public class ReceiptDetailServiceImpl extends ServiceImpl&lt;ReceiptDetailMapper, R
             //物料是否有入库流程
             List<StatusFlowDetail> statusFlowDetails = statusFlowDetailService.queryStatusFlowDetail(receiptType.getReceiptFlow());
             String status = nextStatusFlow(statusFlowDetails, receiptDetail.getProcessStamp());
-            receiptDetail.setProcessStamp(status);
+            //在状态到达时候是判断是否要质检
+            if ("200".equals(status) && inspection(receiptDetail)){
+                receiptDetail.setProcessStamp("180");
+            } else {
+                receiptDetail.setProcessStamp(status);
+            }
             return receiptDetail;
         } else if (material.getReceivingFlow() != null){
             //物料是否有入库流程
             List<StatusFlowDetail> statusFlowDetails = statusFlowDetailService.queryStatusFlowDetail(material.getReceivingFlow());
             String status = nextStatusFlow(statusFlowDetails, receiptDetail.getProcessStamp());
-            receiptDetail.setProcessStamp(status);
+            //在状态到达时候是判断是否要质检
+            if ("200".equals(status) && inspection(receiptDetail)){
+                receiptDetail.setProcessStamp("180");
+            } else {
+                receiptDetail.setProcessStamp(status);
+            }
             return receiptDetail;
         } else {
             //该物料类别是否有入库流程
@@ -199,7 +225,12 @@ public class ReceiptDetailServiceImpl extends ServiceImpl&lt;ReceiptDetailMapper, R
             if (materialType.getReceivingFlow() != null) {
                 List<StatusFlowDetail> statusFlowDetails = statusFlowDetailService.queryStatusFlowDetail(materialType.getReceivingFlow());
                 String status = nextStatusFlow(statusFlowDetails, receiptDetail.getProcessStamp());
-                receiptDetail.setProcessStamp(status);
+                //在状态到达时候是判断是否要质检
+                if ("200".equals(status) && inspection(receiptDetail)){
+                    receiptDetail.setProcessStamp("180");
+                } else {
+                    receiptDetail.setProcessStamp(status);
+                }
                 return receiptDetail;
             } else {
                 //以上都没有的情况下查询入库首选项中的入库流程
@@ -208,7 +239,12 @@ public class ReceiptDetailServiceImpl extends ServiceImpl&lt;ReceiptDetailMapper, R
                 ReceiptPreference receiptPreference = receiptPreferenceService.getOne(lambda);
                 List<StatusFlowDetail> statusFlowDetails = statusFlowDetailService.queryStatusFlowDetail(receiptPreference.getReceivingFlow());
                 String status = nextStatusFlow(statusFlowDetails, receiptDetail.getProcessStamp());
-                receiptDetail.setProcessStamp(status);
+                //在状态到达时候是判断是否要质检
+                if ("200".equals(status) && inspection(receiptDetail)){
+                    receiptDetail.setProcessStamp("180");
+                } else {
+                    receiptDetail.setProcessStamp(status);
+                }
                 return receiptDetail;
             }
         }
@@ -308,4 +344,20 @@ public class ReceiptDetailServiceImpl extends ServiceImpl&lt;ReceiptDetailMapper, R
         }
         return AjaxResult.success("审核完成");
     }
+
+    /**
+     * 判断明细中是否质检
+     */
+    public boolean inspection(ReceiptDetail receiptDetail){
+        //如果明细中需要质检，则判断是否已经生成质检单
+        if ("0".equals(receiptDetail.getQcCheck())){
+            LambdaQueryWrapper<CheckHeader> lambda = Wrappers.lambdaQuery();
+            lambda.eq(CheckHeader::getReferCode, receiptDetail.getReceiptCode());
+            CheckHeader checkHeader = checkHeaderService.getOne(lambda);
+            if (checkHeader == null){
+                return true;
+            }
+        }
+        return false;
+    }
 }
@@ -158,6 +158,13 @@ public class ReceiptHeaderService extends ServiceImpl&lt;ReceiptHeaderMapper, Recei
         receiptDetailLambda.eq(ReceiptDetail::getReceiptId, id);
         List<ReceiptDetail> receiptDetails = receiptDetailService.list(receiptDetailLambda);
  
+        //判断是否已经生成了质检单
+        LambdaQueryWrapper<CheckHeader> checkHeaderLambdaQueryWrapper = Wrappers.lambdaQuery();
+        checkHeaderLambdaQueryWrapper.eq(CheckHeader::getReferCode, receiptHeader.getCode());
+        CheckHeader checkHeaderQuery = checkHeaderService.getOne(checkHeaderLambdaQueryWrapper);
+        if (checkHeaderQuery != null){
+            throw new ServiceException("质检表已生成");
+        }
         //创建质检头表
         CheckHeader checkHeader = new CheckHeader();
         checkHeader.setCode(receiptHeader.getCode());
@@ -170,7 +177,7 @@ public class ReceiptHeaderService extends ServiceImpl&lt;ReceiptHeaderMapper, Recei
         checkHeader.setLastUpdatedBy(ShiroUtils.getLoginName());
  
         if (!checkHeaderService.save(checkHeader)){
-            throw new ServiceException("添加质检头表发送错误");
+            throw new ServiceException("添加质检头表错误");
         }
  
         //查询保存后的质检头表
@@ -63,16 +63,19 @@ public class ReceiptHeaderHistoryService extends ServiceImpl&lt;ReceiptHeaderHistor
             if (!receiptHeaderService.removeById(receiptHeader.getId())){
                 throw new ServiceException("删除头表失败");
             }
-            //删除入库明细
-            List<Integer> ids = new ArrayList<>();
-            for (int i=0; i<receiptDetailHistoryList.size();i++){
-                receiptDetailHistoryList.get(i).setLastUpdatedBy(ShiroUtils.getLoginName());
-                ids.add(receiptDetailHistoryList.get(i).getId());
-            }
-            if (!receiptDetailService.removeByIds(ids)) {
-                throw new ServiceException("删除明细表失败");
+            // 当存在明细时删除
+            if (list.size()!= 0){
+                //删除入库明细
+                List<Integer> ids = new ArrayList<>();
+                for (int i=0; i<receiptDetailHistoryList.size();i++){
+                    receiptDetailHistoryList.get(i).setLastUpdatedBy(ShiroUtils.getLoginName());
+                    ids.add(receiptDetailHistoryList.get(i).getId());
+                }
+                if (!receiptDetailService.removeByIds(ids)) {
+                    throw new ServiceException("删除明细表失败");
+                }
+                receiptDetailHistoryService.saveBatch(receiptDetailHistoryList);
             }
-            receiptDetailHistoryService.saveBatch(receiptDetailHistoryList);
             this.save(receiptHeaderHistory);
         }else {
             return AjaxResult.success("入库单没有完成，无法删除");
@@ -48,7 +48,7 @@
         <div class="form-group">
             <label class="col-sm-3 control-label">入库流程：</label>
             <div class="col-sm-8">
-                <select id="receiptFlow" name="receiptFlow" class="form-control" th:with="statusFlowList=${@StatusFlow.flowList('入库单')}" th:field="*{receiptFlow}">
+                <select id="receiptFlow" name="receiptFlow" class="form-control" th:with="statusFlowList=${@StatusFlow.flowList('receivingFlow')}" th:field="*{receiptFlow}">
                     <option th:each="flow : ${statusFlowList}" th:text="${flow['name']}" th:value="${flow['code']}"></option>
                 </select>
             </div>
@@ -52,7 +52,10 @@
         <div class="form-group">
             <label class="col-sm-3 control-label">是否质检：</label>
             <div class="col-sm-8">
-                <input id="qcCheck" name="qcCheck" class="form-control" type="text">
+                <select id="qcCheck" name="qcCheck" class="form-control">
+                    <option value="1">否</option>
+                    <option value="0">是</option>
+                </select>
             </div>
         </div>
         <div class="form-group">
@@ -70,7 +73,7 @@
         <div class="form-group">
             <label class="col-sm-3 control-label">库存状态：</label>
             <div class="col-sm-8">
-                <select id="inventorySts" name="inventorySts" class="form-control" th:with="inventoryStatus=${@dict.getType('inventoryStatus')}">
+                <select id="inventorySts" name="inventorySts" class="form-control" th:with="inventoryStatus=${@dict.getType('inventorySts')}">
                     <option th:each="dict : ${inventoryStatus}" th:text="${dict['dictLabel']}" th:value="${dict['dictValue']}"></option>
                 </select>
             </div>
@@ -84,12 +87,21 @@
         <div class="form-group">
             <label class="col-sm-3 control-label">定位规则：</label>
             <div class="col-sm-8">
-                <select id="locatingRule" name="locatingRule" class="form-control" th:with="list=${@FilterConfigDetailService.queryFilterConfigDetail('入库')}">
+                <select id="locatingRule" name="locatingRule" class="form-control" th:with="list=${@FilterConfigDetailService.queryFilterConfigDetail('locationRule')}">
                     <option value="">请选择</option>
                     <option th:each="item : ${list}" th:text="${item['description']}" th:value="${item['code']}"></option>
                 </select>
             </div>
         </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">入库流程：</label>
+            <div class="col-sm-8">
+                <select id="statusFlowCode" name="statusFlowCode" class="form-control" th:with="statusFlowList=${@StatusFlow.flowList('receivingFlow')}">
+                    <option value="">请选择</option>
+                    <option th:each="flow : ${statusFlowList}" th:text="${flow['name']}" th:value="${flow['code']}"></option>
+                </select>
+            </div>
+        </div>
 <!--        <div class="form-group">-->
 <!--            <label class="col-sm-3 control-label">标价：</label>-->
 <!--            <div class="col-sm-8">-->
@@ -150,6 +162,7 @@
         submitHandler: function(form) {
             var tableValue = $("#form-receiptDetail-add").serialize();
             tableValue = formValueReplace(tableValue, "inventorySts", $("#inventorySts option:selected").val());
+            tableValue = formValueReplace(tableValue, "qcCheck", $("#qcCheck option:selected").val());
             $.operate.save(prefix + "/add", tableValue);
         }
     });
@@ -53,7 +53,10 @@
         <div class="form-group">
             <label class="col-sm-3 control-label">是否质检：</label>
             <div class="col-sm-8">
-                <input id="qcCheck" name="qcCheck" class="form-control" type="text" th:field="*{qcCheck}">
+                <select id="qcCheck" name="qcCheck" class="form-control">
+                    <option value="1">否</option>
+                    <option value="0">是</option>
+                </select>
             </div>
         </div>
         <div class="form-group">
@@ -72,7 +75,7 @@
             <label class="col-sm-3 control-label">库存状态：</label>
             <div class="col-sm-8">
                 <select id="inventorySts" name="inventorySts" class="form-control"
-                        th:with="inventoryStatus=${@dict.getType('inventoryStatus')}" th:field="*{inventorySts}">
+                        th:with="inventoryStatus=${@dict.getType('inventorySts')}" th:field="*{inventorySts}">
                     <option th:each="dict : ${inventoryStatus}" th:text="${dict['dictLabel']}" th:value="${dict['dictValue']}"></option>
                 </select>
             </div>
@@ -86,7 +89,11 @@
         <div class="form-group">
             <label class="col-sm-3 control-label">定位规则：</label>
             <div class="col-sm-8">
-                <input id="locatingRule" name="locatingRule" class="form-control" type="text" th:field="*{locatingRule}">
+                <select id="locatingRule" name="locatingRule" class="form-control"
+                        th:with="list=${@FilterConfigDetailService.queryFilterConfigDetail('locationRule')}" th:field="*{locatingRule}">
+                    <option value="">请选择</option>
+                    <option th:each="item : ${list}" th:text="${item['description']}" th:value="${item['code']}"></option>
+                </select>
             </div>
         </div>
         <div class="form-group">
@@ -101,6 +108,16 @@
                 <input id="itemNetPrice" name="itemNetPrice" class="form-control" type="text" th:field="*{itemNetPrice}">
             </div>
         </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">入库流程：</label>
+            <div class="col-sm-8">
+                <select id="statusFlowCode" name="statusFlowCode" class="form-control"
+                        th:with="statusFlowList=${@StatusFlow.flowList('receivingFlow')}" th:field="*{statusFlowCode}">
+                    <option value="">请选择</option>
+                    <option th:each="flow : ${statusFlowList}" th:text="${flow['name']}" th:value="${flow['code']}"></option>
+                </select>
+            </div>
+        </div>
         <!--<div class="form-group">-->
         <!--<label class="col-sm-3 control-label">自定义字段1：</label>-->
         <!--<div class="col-sm-8">-->
@@ -541,6 +541,10 @@
                 visible:false
             },
             {
+                field : 'statusFlowCode',
+                title : '流程编码'
+            },
+            {
                 field : 'isVirtualBom',
                 title : '是否虚拟套件',
                 formatter: function(value, row, index) {