Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun

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

@@ -36,6 +36,11 @@ public class WarehouseBaseInfo extends BaseModel<WarehouseBaseInfo> {
      */
     @TableField(exist = false)
     private List<WarehousePositionInfo> positionInfos;
+    /**
+     * 仓库货名列表
+     */
+    @TableField(exist = false)
+    private List<WarehousePositionStorageInfo> goodsNameInfos;
     /**
      * 主键
      */

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

@@ -121,6 +121,7 @@ public class IdentityAuthenticationInfoServiceImpl extends ServiceImpl<IdentityA
             identityAuthenticationInfo1.setCover("1");
             this.updateById(identityAuthenticationInfo1);
         }
+        identityAuthenticationInfo2.setCustomerPhone(identityAuthenticationInfo.getCustomerPhone());
         //修改身份认证信息
         this.updateById(identityAuthenticationInfo2);
         return "OK";

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

@@ -4,8 +4,15 @@ import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.mapper.Wrapper;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.google.common.collect.Lists;
+import com.winsea.svc.base.base.entity.CommonStaff;
+import com.winsea.svc.base.base.service.ICommonRoleResourceService;
+import com.winsea.svc.base.base.service.ICommonStaffService;
 import com.winsea.svc.base.security.util.AuthSecurityUtils;
 import com.winsea.svc.base.workflow.entity.Workflow;
+import com.winsea.svc.notice.entity.NoticeTaskInfo;
+import com.winsea.svc.notice.entity.base.BaseNotice;
+import com.winsea.svc.notice.service.INoticeService;
+import com.winsea.svc.notice.service.INoticeTaskService;
 import com.yh.saas.common.support.util.IdGenerator;
 import com.yh.saas.common.support.util.StringUtils;
 import com.yh.saas.plugin.base.service.ICommonBillOperateHisService;
@@ -54,7 +61,14 @@ public class TranProcessInfoServiceImpl extends ServiceImpl<TranProcessInfoMappe
     private IDriverPayeeInfoService driverPayeeInfoService;
     @Autowired
     private INewWorkflowService workflowService;
-
+    @Autowired
+    private INoticeService noticeService;
+    @Autowired
+    private INoticeTaskService noticeTaskService;
+    @Autowired
+    private ICommonStaffService staffService;
+    @Autowired
+    private ICommonRoleResourceService roleResourceService;
     /**
      * 汽运调度分页列表查询
      *
@@ -400,7 +414,9 @@ public class TranProcessInfoServiceImpl extends ServiceImpl<TranProcessInfoMappe
         //物流部提交
         if ("1".equals(tranProcessInfo.getFlag())) {
             tranProcessInfo.setPriceStatus("审核中");
+            tesk(tranProcessInfo);
         }
+
         //决策人审核
         else {
             tranProcessInfo.setTranPrice(tranProcessInfo.getTranPriceIng());
@@ -414,8 +430,47 @@ public class TranProcessInfoServiceImpl extends ServiceImpl<TranProcessInfoMappe
             tranPriceApprove.setResult("通过");
             tranPriceApprove.setTranPrice(tranProcessInfo.getTranPrice());
             tranPriceApproveService.insert(tranPriceApprove);
+            // 先删除任务
+            noticeService.removeNotice(BaseNotice.NoticeStatus.TASK, "TRAN-TASK-APPROVE",
+                    tranProcessInfo.getId(), null);
         }
         this.updateById(tranProcessInfo);
         return "ok";
     }
+
+
+    /**
+     * 任务
+     *
+     * @param tranProcessInfo
+     */
+    private void tesk(TranProcessInfo tranProcessInfo) {
+        // 先删除任务
+        noticeService.removeNotice(BaseNotice.NoticeStatus.TASK, "TRAN-TASK-APPROVE",
+                tranProcessInfo.getId(), null);
+        String staffName = "XXX";
+        CommonStaff commitUserInfo = staffService.getInfo(AuthSecurityUtils.getCurrentUserId());
+        if (commitUserInfo != null) {
+            staffName = commitUserInfo.getMajorRole() != null
+                    ? commitUserInfo.getMajorRole().getRoleName() + " " + commitUserInfo.getStaffName()
+                    : commitUserInfo.getStaffName();
+        }
+        String taskContent = "";
+        List<String> roleIdList = Lists.newArrayList();
+        roleIdList = roleResourceService.getBindRoleIdsByResourceIds(AuthSecurityUtils.getCurrentUserInfo().getCompId(),
+                Lists.newArrayList("vehicleDispatching-reprice"));
+        // 向下一步操作人发送任务通知
+            taskContent =  staffName + "提交的运输单价等待审核";
+        NoticeTaskInfo taskInfo = new NoticeTaskInfo();
+        taskInfo.setCompId(commitUserInfo.getCompId());
+        taskInfo.setAcceptType(BaseNotice.AcceptStatus.STAFF);
+        taskInfo.setBusinessId(tranProcessInfo.getId());
+        taskInfo.setBusinessType("Tran");
+        taskInfo.setMessageContent(taskContent);
+        taskInfo.setBusinessCode("TRAN-TASK-APPROVE");
+//            taskInfo.setNoticeTaskStatus(NoticeTaskInfo.NoticeTaskStatus.RETURN);
+        noticeTaskService.createNoticeTask(roleIdList,
+                null, taskInfo);
+
+    }
 }

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

@@ -734,7 +734,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("contract_no",contractManagementInfo.getContractNo()).eq("tran_type","1"));
                 if (!CollectionUtils.isEmpty(tranCarInfoList)){
                     contractManagementInfo.setTranCarInfoList(tranCarInfoList);
                 }
@@ -756,7 +756,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("contract_no",inOutWarehouseTask.getMoveTaskNo()).eq("tran_type","1"));
                 if (!CollectionUtils.isEmpty(tranCarInfoList)){
                     contractManagementInfo.setTranCarInfoList(tranCarInfoList);
                 }
@@ -781,7 +781,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("submit","0"));
+                        .eq("contract_no",contractManagementInfo.getContractNo()).eq("tran_type","1").eq("submit","0"));
                 if (!CollectionUtils.isEmpty(tranCarInfoList)){
                     contractManagementInfo.setTranCarInfoList(tranCarInfoList);
                 }
@@ -803,7 +803,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("submit","0"));
+                        .eq("contract_no",inOutWarehouseTask.getMoveTaskNo()).eq("tran_type","1").eq("submit","0"));
                 if (!CollectionUtils.isEmpty(tranCarInfoList)){
                     contractManagementInfo.setTranCarInfoList(tranCarInfoList);
                 }
@@ -875,7 +875,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("submit","0"));
+                        .eq("contract_no",contractManagementInfo.getContractNo()).eq("tran_type","1").eq("submit","0"));
                 if (!CollectionUtils.isEmpty(tranCarInfoList)){
                     contractManagementInfo.setTranCarInfoList(tranCarInfoList);
                 }
@@ -897,7 +897,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("submit","0"));
+                        .eq("contract_no",contractManagementInfo1.getContractNo()).eq("tran_type","1").eq("submit","0"));
                 if (!CollectionUtils.isEmpty(tranCarInfoList)){
                     contractManagementInfo1.setTranCarInfoList(tranCarInfoList);
                 }
@@ -917,7 +917,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("submit","0"));
+                        .eq("contract_no",inOutWarehouseTask.getMoveTaskNo()).eq("tran_type","1").eq("submit","0"));
                 if (!CollectionUtils.isEmpty(tranCarInfoList)){
                     contractManagementInfo.setTranCarInfoList(tranCarInfoList);
                 }
@@ -1031,10 +1031,22 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
         }
         if (!CollectionUtils.isEmpty(warehouseBaseInfoList)) {
             for (WarehouseBaseInfo warehouseBaseInfo : warehouseBaseInfoList) {
+                List<WarehousePositionStorageInfo> temp = new ArrayList();
                 // 以库位为维度查询
                 List<WarehousePositionInfo> warehousePositionInfos = warehousePositionInfoService.selectList(new EntityWrapper<WarehousePositionInfo>()
                         .eq("base_id", warehouseBaseInfo.getId()));
                 if (!CollectionUtils.isEmpty(warehousePositionInfos)) {
+                    for (WarehousePositionInfo warehousePositionInfo:warehousePositionInfos) {
+                        //查询仓库内的货名
+                        List<WarehousePositionStorageInfo> warehousePositionStorageInfos = warehousePositionStorageInfoService.selectList(new EntityWrapper<WarehousePositionStorageInfo>()
+                                .eq("position_id", warehousePositionInfo.getId()));
+                        if (!CollectionUtils.isEmpty(warehousePositionStorageInfos)){
+                            for (WarehousePositionStorageInfo warehousePositionStorageInfo:warehousePositionStorageInfos){
+                                temp.add(warehousePositionStorageInfo);
+                            }
+                        }
+                    }
+                    warehouseBaseInfo.setGoodsNameInfos(temp);
                     warehouseBaseInfo.setPositionInfos(warehousePositionInfos);
                 }
             }

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

@@ -678,28 +678,6 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                 stockPurchaseReceiptReport.setStatusFlag(StatusEnum.FORM_REVIEWED.getFlag());
                                 stockPurchaseReceiptReport.setStatus(StatusEnum.FORM_REVIEWED.getName());
                                 stockPurchaseReceiptReportService.insert(stockPurchaseReceiptReport);
-                                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());
-                                    tranCarInfo.setUnloadPoundImg(warehouseInOutInfo.getAddressUrl());
-//                                    tranCarInfo.setDeductionAmount(warehouseInOutInfo.getDeductionAmount());
-                                    tranCarInfo.setStatus(StatusEnum.DELIVERED.getName());
-                                    tranCarInfo.setStatusFlag(StatusEnum.DELIVERED.getFlag());
-                                    if ("1".equals(tranCarInfo.getSubmit())) {
-                                        throw new YException(YExceptionEnum.CARNO_SUBMITTED_ERROR);
-                                    } else {
-                                        tranCarInfo.setSubmit("1");
-                                    }
-                                    tranCarInfoService.updateById(tranCarInfo);
-                                }
                             }
                         }
 
@@ -854,8 +832,29 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                         stockSaleReceiptReport.setAmountNotReceivable(stockSaleReceiptReport.getAmountIngReceivable());
                         stockSaleReceiptReport.setStatusFlag(StatusEnum.FORM_REVIEWED.getFlag());
                         stockSaleReceiptReport.setStatus(StatusEnum.FORM_REVIEWED.getName());
-
                         stockSaleReceiptReportService.insert(stockSaleReceiptReport);
+                        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());
+                            tranCarInfo.setUnloadPoundImg(warehouseInOutInfo.getAddressUrl());
+//                                    tranCarInfo.setDeductionAmount(warehouseInOutInfo.getDeductionAmount());
+                            tranCarInfo.setStatus(StatusEnum.DELIVERED.getName());
+                            tranCarInfo.setStatusFlag(StatusEnum.DELIVERED.getFlag());
+                            if ("1".equals(tranCarInfo.getSubmit())) {
+                                throw new YException(YExceptionEnum.CARNO_SUBMITTED_ERROR);
+                            } else {
+                                tranCarInfo.setSubmit("1");
+                            }
+                            tranCarInfoService.updateById(tranCarInfo);
+                        }
                     }
                     //判断是否有货
                     if (warehouseBaseInfo != null) {
@@ -955,6 +954,28 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                         stockSaleReceiptReport.setStatus(StatusEnum.FORM_REVIEWED.getName());
 
                         stockSaleReceiptReportService.insert(stockSaleReceiptReport);
+                        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());
+                            tranCarInfo.setUnloadPoundImg(warehouseInOutInfo.getAddressUrl());
+//                                    tranCarInfo.setDeductionAmount(warehouseInOutInfo.getDeductionAmount());
+                            tranCarInfo.setStatus(StatusEnum.DELIVERED.getName());
+                            tranCarInfo.setStatusFlag(StatusEnum.DELIVERED.getFlag());
+                            if ("1".equals(tranCarInfo.getSubmit())) {
+                                throw new YException(YExceptionEnum.CARNO_SUBMITTED_ERROR);
+                            } else {
+                                tranCarInfo.setSubmit("1");
+                            }
+                            tranCarInfoService.updateById(tranCarInfo);
+                        }
                     }
                     if (warehouseBaseInfo != null) {
                         //出库时打入成本