修改

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/TranCarInfo.java

@@ -146,7 +146,7 @@ public class TranCarInfo extends BaseModel<TranCarInfo> {
      */
     private String signStatusFlag;
     /**
-     * 未提交0提交1
+     * 未提交0 出库提交1 入库提交2
      */
     private String submit;
     /**

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/TranProcessInfoServiceImpl.java

@@ -91,6 +91,16 @@ public class TranProcessInfoServiceImpl extends ServiceImpl<TranProcessInfoMappe
         pageView.put("searchType", tranProcessInfo.getSearchType());
         pageView.put("startDate", tranProcessInfo.getStartDate());
         pageView.put("endDate", tranProcessInfo.getEndDate());
+        //发货反馈
+        if("1".equals(tranProcessInfo.getFeedbackFlag())||"2".equals(tranProcessInfo.getFeedbackFlag())||"3".equals(tranProcessInfo.getFeedbackFlag())){
+            tranProcessInfo.setSenderPhone(AuthSecurityUtils.getStaffById(AuthSecurityUtils.getCurrentUserId()).getStaffMobilePhone());
+        }
+        //收货反馈
+        if("4".equals(tranProcessInfo.getFeedbackFlag())||"5".equals(tranProcessInfo.getFeedbackFlag())||"6".equals(tranProcessInfo.getFeedbackFlag())){
+            tranProcessInfo.setReceiverPhone(AuthSecurityUtils.getStaffById(AuthSecurityUtils.getCurrentUserId()).getStaffMobilePhone());
+        }
+        pageView.put("senderPhone", tranProcessInfo.getSenderPhone());
+        pageView.put("receiverPhone", tranProcessInfo.getReceiverPhone());
         pageView.put("pageSize", tranProcessInfo.getPageSize());
         pageView.put("currentPage", tranProcessInfo.getCurrentPage());
         pageView.put("tranTypeKey", tranProcessInfo.getTranTypeKey());

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/WarehouseBaseInfoServiceImpl.java

@@ -797,7 +797,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                         .eq("contract_id",contractManagementInfo.getId()));
                 //查合同下的车牌号
                 List<TranCarInfo> tranCarInfoList=tranCarInfoService.selectList(new EntityWrapper<TranCarInfo>()
-                        .eq("contract_no",contractManagementInfo.getContractNo()).eq("tran_type","1"));
+                        .eq("contract_no",contractManagementInfo.getContractNo()).eq("tran_type","1").ne("submit","1"));
                 if (!CollectionUtils.isEmpty(tranCarInfoList)){
                     contractManagementInfo.setTranCarInfoList(tranCarInfoList);
                 }
@@ -821,7 +821,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                 BeanUtils.copyProperties(inOutWarehouseTask, contractManagementInfo);
                 //查移库任务编号下的车牌号
                 List<TranCarInfo> tranCarInfoList=tranCarInfoService.selectList(new EntityWrapper<TranCarInfo>()
-                        .eq("contract_no",inOutWarehouseTask.getMoveTaskNo()).eq("tran_type","1"));
+                        .eq("contract_no",inOutWarehouseTask.getMoveTaskNo()).eq("tran_type","1").ne("submit","1"));
                 if (!CollectionUtils.isEmpty(tranCarInfoList)){
                     contractManagementInfo.setTranCarInfoList(tranCarInfoList);
                 }
@@ -940,7 +940,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                         .eq("contract_id",contractManagementInfo.getId()));
                 //查合同下的车牌号,入库只能查到未提交的
                 List<TranCarInfo> tranCarInfoList=tranCarInfoService.selectList(new EntityWrapper<TranCarInfo>()
-                        .eq("contract_no",contractManagementInfo.getContractNo()).eq("tran_type","1").eq("submit","0"));
+                        .eq("contract_no",contractManagementInfo.getContractNo()).eq("tran_type","1").ne("submit","2"));
                 if (!CollectionUtils.isEmpty(tranCarInfoList)){
                     contractManagementInfo.setTranCarInfoList(tranCarInfoList);
                 }
@@ -962,7 +962,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                         .eq("contract_id",contractManagementInfo1.getId()));
                 //查合同下的车牌号,入库只能查到未提交的
                 List<TranCarInfo> tranCarInfoList=tranCarInfoService.selectList(new EntityWrapper<TranCarInfo>()
-                        .eq("contract_no",contractManagementInfo1.getContractNo()).eq("tran_type","1").eq("submit","0"));
+                        .eq("contract_no",contractManagementInfo1.getContractNo()).eq("tran_type","1").ne("submit","2"));
                 if (!CollectionUtils.isEmpty(tranCarInfoList)){
                     contractManagementInfo1.setTranCarInfoList(tranCarInfoList);
                 }
@@ -982,7 +982,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                 BeanUtils.copyProperties(inOutWarehouseTask, contractManagementInfo);
                 //查移库任务编号下的车牌号,入库只能查到未提交的
                 List<TranCarInfo> tranCarInfoList=tranCarInfoService.selectList(new EntityWrapper<TranCarInfo>()
-                        .eq("contract_no",inOutWarehouseTask.getMoveTaskNo()).eq("tran_type","1").eq("submit","0"));
+                        .eq("contract_no",inOutWarehouseTask.getMoveTaskNo()).eq("tran_type","1").ne("submit","2"));
                 if (!CollectionUtils.isEmpty(tranCarInfoList)){
                     contractManagementInfo.setTranCarInfoList(tranCarInfoList);
                 }

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/WarehouseInOutInfoServiceImpl.java

@@ -694,6 +694,28 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                 workflowService.activateInstance(stockPurchaseReceiptReport.getWorkflowId(), stockPurchaseReceiptReport.getId());
                             }
                         }
+                        Wrapper wrapper = new EntityWrapper<TranCarInfo>()
+                                .eq("contract_no", warehouseInOutInfo.getContractNo())
+                                .eq("car_no", warehouseInOutInfo.getCarNo())
+                                .eq(TranCarInfo.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0);
+                        if (warehouseInOutInfo.getTranCarNo() != null && !warehouseInOutInfo.getTranCarNo().isEmpty()) {
+                            wrapper.eq("tran_car_no", warehouseInOutInfo.getTranCarNo());
+                        }
+                        TranCarInfo tranCarInfo = tranCarInfoService.selectOne(wrapper);
+                        if (tranCarInfo != null) {
+                            //将到货数据同步到派车表
+                            tranCarInfo.setUnloadNetWeight(warehouseInOutInfo.getNetWeight());
+                            if (warehouseInOutInfo.getAddressUrl()!=null) {
+                                tranCarInfo.setUnloadPoundImg(warehouseInOutInfo.getAddressUrl());
+                            }
+                            tranCarInfo.setUnloadingDate(warehouseInOutInfo.getInOutDate());
+                            if ("2".equals(tranCarInfo.getSubmit())) {
+                                throw new YException(YExceptionEnum.CARNO_SUBMITTED_ERROR);
+                            } else {
+                                tranCarInfo.setSubmit("2");
+                            }
+                            tranCarInfoService.updateById(tranCarInfo);
+                        }
                     }
                     //常用库移库入库类型
                     else if ("3".equals(warehouseInOutInfo.getInOutTypeKey())) {
@@ -1011,12 +1033,15 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                         }
                         TranCarInfo tranCarInfo = tranCarInfoService.selectOne(wrapper);
                         if (tranCarInfo != null) {
-                            //将到货数据同步到派车表
-                            tranCarInfo.setUnloadNetWeight(warehouseInOutInfo.getNetWeight());
-                            tranCarInfo.setUnloadPoundImg(warehouseInOutInfo.getAddressUrl());
+                            //将发货数据同步到派车表
+                            tranCarInfo.setLoadNetWeight(warehouseInOutInfo.getNetWeight());
+                            if (warehouseInOutInfo.getAddressUrl()!=null) {
+                                tranCarInfo.setLoadPoundImg(warehouseInOutInfo.getAddressUrl());
+                            }
+                            tranCarInfo.setLoadingDate(warehouseInOutInfo.getInOutDate());
 //                                    tranCarInfo.setDeductionAmount(warehouseInOutInfo.getDeductionAmount());
-                            tranCarInfo.setStatus(StatusEnum.DELIVERED.getName());
-                            tranCarInfo.setStatusFlag(StatusEnum.DELIVERED.getFlag());
+//                            tranCarInfo.setStatus(StatusEnum.DELIVERED.getName());
+//                            tranCarInfo.setStatusFlag(StatusEnum.DELIVERED.getFlag());
                             if ("1".equals(tranCarInfo.getSubmit())) {
                                 throw new YException(YExceptionEnum.CARNO_SUBMITTED_ERROR);
                             } else {
@@ -1179,12 +1204,15 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                         }
                         TranCarInfo tranCarInfo = tranCarInfoService.selectOne(wrapper);
                         if (tranCarInfo != null) {
-                            //将到货数据同步到派车表
-                            tranCarInfo.setUnloadNetWeight(warehouseInOutInfo.getNetWeight());
-                            tranCarInfo.setUnloadPoundImg(warehouseInOutInfo.getAddressUrl());
+                            //将发货数据同步到派车表
+                            tranCarInfo.setLoadNetWeight(warehouseInOutInfo.getNetWeight());
+                            if (warehouseInOutInfo.getAddressUrl()!=null) {
+                                tranCarInfo.setLoadPoundImg(warehouseInOutInfo.getAddressUrl());
+                            }
+                            tranCarInfo.setLoadingDate(warehouseInOutInfo.getInOutDate());
 //                                    tranCarInfo.setDeductionAmount(warehouseInOutInfo.getDeductionAmount());
-                            tranCarInfo.setStatus(StatusEnum.DELIVERED.getName());
-                            tranCarInfo.setStatusFlag(StatusEnum.DELIVERED.getFlag());
+//                            tranCarInfo.setStatus(StatusEnum.DELIVERED.getName());
+//                            tranCarInfo.setStatusFlag(StatusEnum.DELIVERED.getFlag());
                             if ("1".equals(tranCarInfo.getSubmit())) {
                                 throw new YException(YExceptionEnum.CARNO_SUBMITTED_ERROR);
                             } else {

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/TranProcessInfoMapper.xml

@@ -21,6 +21,12 @@
                 AND p.process_status_flag = '3'
             </if>
         </if>
+        <if test="senderPhone != null and senderPhone != ''">
+            AND p.sender_phone = #{senderPhone}
+        </if>
+        <if test="receiverPhone != null and receiverPhone != ''">
+            AND p.receiver_phone = #{receiverPhone}
+        </if>
         <if test="feedbackFlag != null and feedbackFlag != ''">
             <if test="feedbackFlag == 1">
                 AND p.feedback_status_flag = '1'
@@ -101,6 +107,12 @@
                 AND p.process_status_flag = '3'
             </if>
         </if>
+        <if test="senderPhone != null and senderPhone != ''">
+            AND p.sender_phone = #{senderPhone}
+        </if>
+        <if test="receiverPhone != null and receiverPhone != ''">
+            AND p.receiver_phone = #{receiverPhone}
+        </if>
         <if test="feedbackFlag != null and feedbackFlag != ''">
             <if test="feedbackFlag == 1">
                 AND p.feedback_status_flag = '1'