领料推送修复

platform-dao/src/main/java/com/platform/dao/enums/RepairApplicationFormStatusEnum.java

@@ -31,8 +31,7 @@ public enum RepairApplicationFormStatusEnum {
      */
     NOT_ACCEPTANCE(4),
     /**
-     * 已驳回
-     * 生产驳回
+     * 报修驳回
      */
     REBACK(5),
     /**

platform-service/src/main/java/com/platform/service/repair/strategy/impl/LongYanRepairStrategy.java

@@ -99,6 +99,7 @@ public class LongYanRepairStrategy extends AbstractRepairBaseStrategy {
         form.setUserId(SecurityUtils.getUserInfo().getUserId());
         // 区域负责人
         form.setReportLeaderId(getReportLeaderId(model.getSbId()));
+        form.setStatus(RepairApplicationFormStatusEnum.NOT_ALLOCATED.getValue());
         repairApplicationFormMapper.insert(form);
         // 记录维修状态跟踪
         addRepairStatusRecord(form,"报修");
@@ -121,11 +122,6 @@ public class LongYanRepairStrategy extends AbstractRepairBaseStrategy {
             });
         }
         sendMessageToRepairManger(form,mmScb,CommonConstants.CALL_REPAIR_NOTICE);
-        // 给该部门班组长推送信息
-        /*List<SysUserVO> banzuzhangs = getRepairMangers(repairDeptId,null,SysRoleCodeEnum.Maintenance_Leader.name());
-        if(banzuzhangs != null && banzuzhangs.size() > 0){
-            sendMessageToRepairManger(form,banzuzhangs,CommonConstants.CALL_REPAIR_NOTICE);
-        }*/
         // 给值班人员发送消息
         if(isSendMessage()){
             String everyWhereUsers = ConfigCache.getLabelByValueAllowNull(SysConfigEnum.REPAIR_TWENTY_FOUR_USER.name());

platform-service/src/main/java/com/platform/service/yongyou/impl/YongyouServiceImpl.java

@@ -121,7 +121,7 @@ public class YongyouServiceImpl implements YongyouService {
         req.setCSrv("192.168.16.249");
         req.setPUserId("sb");
         req.setPPassword("321.jkl");
-        if (type==1) {
+        if (type==1) { // 新厂
             req.setPAccId("005");
         }else{
             req.setPAccId("004");
@@ -344,7 +344,7 @@ public class YongyouServiceImpl implements YongyouService {
         OtherOutHandler handler = new OtherOutHandler();
         OtherOutAddRequest req = new OtherOutAddRequest();
         req.setOtherOutVouch(otherOutVouch);
-        req.setToken(geToken());
+        req.setToken(geToken(outStoreFormVO.getOldOrNew()));
         req.setConn(getConn());
         req.setCAcc_ID(getCAccId());
         req.setTradeID("");