问题修改

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/BaseAccadjApplyFeign.java

@@ -25,13 +25,10 @@
  *********************************************************/
 package com.yxt.anrui.base.api.baseaccadjapply;
 
-import com.yxt.anrui.base.api.baseaccadjapply.flow.BaseAccAdjApplyCompleteDto;
+import com.yxt.anrui.base.api.baseaccadjapply.flow.*;
-import com.yxt.anrui.base.api.baseaccadjapply.flow.BaseAccAdjApplyTaskQuery;
-import com.yxt.anrui.base.api.baseaccadjapply.flow.SubmitBaseAccAdjApplyDto;
 import com.yxt.anrui.base.api.baseinternalpurchase.BaseInternalPurchaseDetailsVo;
 import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleDetailsVo;
 import com.yxt.anrui.base.api.baseshuntinginvoicingapply.flow.BaseShuntingInvoicingApplyCompleteDto;
-import com.yxt.anrui.base.api.busvehicleapply.flow.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import com.yxt.common.core.query.PagerQuery;
@@ -113,8 +110,8 @@ public interface BaseAccadjApplyFeign {
     ResultBean<List<GetNodeVo>> getPreviousNodesForReject(@Valid @SpringQueryMap GetNodeQuery query);
 
     @ApiOperation(value = "获取下一个环节")
-    @GetMapping(value = "/getNextNodesForSubmit")
+    @PostMapping(value = "/getNextNodesForSubmit")
-    ResultBean<List<GetNodeVo>> getNextNodesForSubmit(@Valid @SpringQueryMap GetNodeQuery query);
+    ResultBean<List<GetNodeVo>> getNextNodesForSubmit(@Valid @RequestBody GetNodeQuery query);
 
     @ApiOperation(value = "驳回任务")
     @PostMapping(value = "/reject")

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/BaseAccadjApplyFeignFallback.java

@@ -55,23 +55,23 @@ import java.util.List;
 public class BaseAccadjApplyFeignFallback implements BaseAccadjApplyFeign {
 
     @Override
-	public ResultBean<PagerVo<BaseAccadjApplyVo>> listPage(PagerQuery<BaseAccadjApplyQuery> pq){
+    public ResultBean<PagerVo<BaseAccadjApplyVo>> listPage(PagerQuery<BaseAccadjApplyQuery> pq) {
         ResultBean rb = ResultBean.fireFail();
         return rb.setMsg("接口anrui-base/baseaccadjapply/listPage无法访问");
     }
 
     @Override
-	public ResultBean save(BaseAccadjApplyDto dto){
+    public ResultBean save(BaseAccadjApplyDto dto) {
         return ResultBean.fireFail().setMsg("接口anrui-base/baseaccadjapply/save无法访问");
     }
 
     @Override
-	public ResultBean delBySids( String[] sids){
+    public ResultBean delBySids(String[] sids) {
         return ResultBean.fireFail().setMsg("接口anrui-base/baseaccadjapply/delBySids无法访问");
     }
 
     @Override
-	public ResultBean<BaseAccadjApplyDetailsVo> fetchDetailsBySid(String sid){
+    public ResultBean<BaseAccadjApplyDetailsVo> fetchDetailsBySid(String sid) {
         ResultBean rb = ResultBean.fireFail();
         return rb.setMsg("接口anrui-base/baseaccadjapply/fetchDetailsBySid无法访问");
     }
@@ -102,12 +102,12 @@ public class BaseAccadjApplyFeignFallback implements BaseAccadjApplyFeign {
     }
 
     @Override
-	public ResultBean<List<GetNodeVo>> getPreviousNodesForReject(GetNodeQuery query) {
+    public ResultBean<List<com.yxt.anrui.base.api.baseaccadjapply.flow.GetNodeVo>> getPreviousNodesForReject(com.yxt.anrui.base.api.baseaccadjapply.flow.GetNodeQuery query) {
         return null;
     }
 
     @Override
-	public ResultBean<List<GetNodeVo>> getNextNodesForSubmit(GetNodeQuery query) {
+    public ResultBean<List<com.yxt.anrui.base.api.baseaccadjapply.flow.GetNodeVo>> getNextNodesForSubmit(com.yxt.anrui.base.api.baseaccadjapply.flow.GetNodeQuery query) {
         return null;
     }
 

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/flow/GetNodeQuery.java

@@ -1,10 +1,12 @@
 package com.yxt.anrui.base.api.baseaccadjapply.flow;
 
+import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicle;
 import com.yxt.common.core.query.Query;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -20,6 +22,6 @@ public class GetNodeQuery implements Query {
     @NotBlank(message = "参数错误：taskDefKey")
     private String taskDefKey;
 
-    @ApiModelProperty(value = "分支字段及业务字段")
+    @ApiModelProperty("调账车辆列表")
-    private Map<String, Object> formVariables;
+    private List<BaseInternalPurchaseVehicle> baseInternalPurchaseVehicles; // 调账车辆列表
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/flow/GetNodeQuery.java

@@ -7,6 +7,7 @@ import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Author dimengzhe
@@ -21,9 +22,8 @@ public class GetNodeQuery implements Query {
     private String taskDefKey;
     @ApiModelProperty(value = "业务sid")
     private String businessSid;
-    @ApiModelProperty("调账车辆列表")
-    private List<BaseInternalPurchaseVehicle> baseInternalPurchaseVehicles; // 调账车辆列表
 
- /*   @ApiModelProperty(value = "分支字段及业务字段")
+
-    private Map<String, Object> formVariables;*/
+    @ApiModelProperty(value = "分支字段及业务字段")
+    private Map<String, Object> formVariables;
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyRest.java

@@ -27,12 +27,8 @@ package com.yxt.anrui.base.biz.baseaccadjapply;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.yxt.anrui.base.api.baseaccadjapply.*;
-import com.yxt.anrui.base.api.baseaccadjapply.flow.BaseAccAdjApplyCompleteDto;
+import com.yxt.anrui.base.api.baseaccadjapply.flow.*;
-import com.yxt.anrui.base.api.baseaccadjapply.flow.BaseAccAdjApplyTaskQuery;
-import com.yxt.anrui.base.api.baseaccadjapply.flow.SubmitBaseAccAdjApplyDto;
 import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleDetailsVo;
-import com.yxt.anrui.base.api.busvehicleapply.flow.GetNodeQuery;
-import com.yxt.anrui.base.api.busvehicleapply.flow.GetNodeVo;
 import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
 import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
 import com.yxt.common.core.query.PagerQuery;

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java

@@ -28,16 +28,17 @@ package com.yxt.anrui.base.biz.baseaccadjapply;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.TypeReference;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.baseaccadjapply.*;
 import com.yxt.anrui.base.api.baseaccadjapply.flow.BaseAccAdjApplyTaskQuery;
+import com.yxt.anrui.base.api.baseaccadjapply.flow.GetNodeQuery;
+import com.yxt.anrui.base.api.baseaccadjapply.flow.GetNodeVo;
 import com.yxt.anrui.base.api.baseaccadjapply.flow.SubmitBaseAccAdjApplyDto;
 import com.yxt.anrui.base.api.baseaccadjapplyeveh.BaseAccadjApplyeVeh;
 import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicle;
 import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleDetailsVo;
-import com.yxt.anrui.base.api.busvehicleapply.flow.GetNodeQuery;
-import com.yxt.anrui.base.api.busvehicleapply.flow.GetNodeVo;
 import com.yxt.anrui.base.biz.baseaccadjapplyeveh.BaseAccadjApplyeVehService;
 import com.yxt.anrui.base.biz.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleService;
 import com.yxt.anrui.base.biz.basevehicle.BaseVehicleService;
@@ -45,6 +46,7 @@ import com.yxt.anrui.base.common.enums.VehicleState;
 import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
 import com.yxt.anrui.fin.api.kingdee.KingDeeResult;
 import com.yxt.anrui.fin.api.kingdee.saloutstock.SalOutStock;
+import com.yxt.anrui.fin.api.kingdee.stkinstock.StkInStock;
 import com.yxt.anrui.flowable.api.flow.FlowableFeign;
 import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
 import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign;
@@ -318,7 +320,7 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
             bv.setComment("重新提交");
             bv.setInstanceId(dto.getInstanceId());
             List<BaseInternalPurchaseVehicle> baseInternalPurchaseVehicles = new ArrayList<>();
-            return complete(bv,baseInternalPurchaseVehicles);
+            return complete(bv, baseInternalPurchaseVehicles);
         }
         return rb;
     }
@@ -361,26 +363,33 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
         return baseMapper.updateFlowFiled(map);
     }
 
-    public ResultBean complete(BusinessVariables bv,List<BaseInternalPurchaseVehicle> baseInternalPurchaseVehicles) {
+    public ResultBean complete(BusinessVariables bv, List<BaseInternalPurchaseVehicle> baseInternalPurchaseVehicles) {
         ResultBean rb = ResultBean.fireFail();
         BaseAccadjApply baseAccadjApply = fetchBySid(bv.getBusinessSid());
         String callInOrgSid = baseAccadjApply.getCallInOrgSid();
         String callOutOrgSid = baseAccadjApply.getCallOutOrgSid();
         List<String> purchaseSids = baseAccadjApplyeVehService.fetchByMainSid(baseAccadjApply.getSid());
         Boolean i = false;
-        if (baseInternalPurchaseVehicles.size() > 0){
+        if (baseInternalPurchaseVehicles != null){
+            if (baseInternalPurchaseVehicles.size() > 0) {
                 for (BaseInternalPurchaseVehicle baseInternalPurchaseVehicle : baseInternalPurchaseVehicles) {
                     String witPinMoney = baseInternalPurchaseVehicle.getWitPinMoney();
                     String sid = baseInternalPurchaseVehicle.getSid();
                     BaseInternalPurchaseVehicle baseInternalPurchaseVehicle1 = baseInternalPurchaseVehicleService.fetchBySid(sid);
                     String witPinMoney1 = baseInternalPurchaseVehicle1.getWitPinMoney();
-                if (!witPinMoney.equals(witPinMoney1)){
+                    if (!witPinMoney.equals(witPinMoney1)) {
                         i = true;
                         break;
                     }
                 }
             }
-        bv.getFormVariables().put("isAdj",i);
+        }
+        Map<String, Object> map = new HashMap<>();
+        Map<String, Object> formVariables = bv.getFormVariables();
+        if (formVariables == null){
+            map.put("isAdj", i);
+            bv.setFormVariables(map);
+        }
         if (bv.getTaskId().equals(baseAccadjApply.getTaskId())) {
             ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
             if (!resultBean.getSuccess()) {
@@ -395,8 +404,67 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
                     baseVehicleService.updateVehicleState(VehicleState.StockEnum.STOCK.getCode(), VehicleState.StockEnum.STOCK.getRemarks(), baseInternalPurchaseVehicle.getVinNo(), callInOrgSid);
                 }
                 try {
+                    List<String> stringList = baseAccadjApplyeVehService.fetchByMainSid(baseAccadjApply.getSid());
+                    List<BaseInternalPurchaseVehicle> baseInternalPurchaseVehicles1 = new ArrayList<>();
+                    for (String s : stringList) {
+                        BaseInternalPurchaseVehicle baseInternalPurchaseVehicle = baseInternalPurchaseVehicleService.fetchBySid(s);
+                        baseInternalPurchaseVehicles1.add(baseInternalPurchaseVehicle);
+                    }
+                    //推送金蝶采购退库单
+                    StkInStock stkInStock=new StkInStock();
+                    /**
+                     *  // 入库日期:FDate  (必填项)
+                     */
+                    stkInStock.setFDate(DateUtil.now());
+                    /**
+                     *   // 采购部门:FPurchaseDeptId  (必填项)
+                     */
+                    stkInStock.setFPurchaseDeptId("05.04");
+                    /**
+                     *  //采购组织:FPurchaseOrgId  (必填项)
+                     */
+                    stkInStock.setFPurchaseOrgId("100012");
+                    /**
+                     * // 供应商:FSupplierId  (必填项)
+                     */
+                    stkInStock.setFSupplierId("010001");
+                    /**
+                     *  //分配目标组织:TOrgId  (必填项)
+                     */
+                    stkInStock.setTOrgId("100012");
+                    /**
+                     * // 物料列表:FInStockEntry  (必填项)
+                     */
+                    List<StkInStock.FInStockEntry> fInStockEntry=new ArrayList<>();
+                    for (BaseInternalPurchaseVehicle baseInternalPurchaseVehicle : baseInternalPurchaseVehicles1) {
+                        StkInStock.FInStockEntry sf=new StkInStock.FInStockEntry();
+                        /**
+                         * 车辆类型
+                         */
+                        sf.setCllx("03");
+                        /**
+                         *   //  批号:FLot
+                         */
+                        sf.setFLot("11112222");
+                        /**
+                         *  // 物料编码:FMaterialId  (必填项)
+                         */
+                        sf.setFMaterialId(baseInternalPurchaseVehicle.getVinNo());
+                        /**
+                         *   //  仓库:FStockId
+                         */
+                        sf.setFStockId("CK001");
+                        /**
+                         * 物料分组
+                         */
+                        sf.setWlfz("01");
+                        fInStockEntry.add(sf);
+                    }
+                    stkInStock.setFInStockEntry(fInStockEntry);
+                    finKingDeeFeign.draftStkInStock(stkInStock);
+                    //推送金蝶销售出库单
                     SalOutStock salOutStock = createSalOutStock(baseAccadjApply);
-                    ResultBean<List<KingDeeResult>> listResultBean = finKingDeeFeign.draftSalOutStock(salOutStock);
+                    finKingDeeFeign.draftSalOutStock(salOutStock);
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
@@ -411,6 +479,12 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
         SalOutStock salOutStock = new SalOutStock();
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         Date date = new Date();
+        List<String> stringList = baseAccadjApplyeVehService.fetchByMainSid(baseAccadjApply.getSid());
+        List<BaseInternalPurchaseVehicle> baseInternalPurchaseVehicles = new ArrayList<>();
+        for (String s : stringList) {
+            BaseInternalPurchaseVehicle baseInternalPurchaseVehicle = baseInternalPurchaseVehicleService.fetchBySid(s);
+            baseInternalPurchaseVehicles.add(baseInternalPurchaseVehicle);
+        }
         /**
          * 日期:FDate  (必填项)
          */
@@ -433,7 +507,7 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
         //salOutStock.setFStockOrgId("101");
 
         List<SalOutStock.FEntity> fEntity = new ArrayList<>();
-
+        for (BaseInternalPurchaseVehicle baseInternalPurchaseVehicle : baseInternalPurchaseVehicles) {
             SalOutStock.FEntity fe = new SalOutStock.FEntity();
             /**
              * 物料编码:FMaterialID
@@ -458,12 +532,14 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
             /**
              * 仓库:FStockID
              */
-        fe.setFStockID("CK001");
+            //fe.setFStockID("CK001");
+            fe.setFStockID(baseInternalPurchaseVehicle.getInventoryLocationSid());
             /**
              * 库存状态:FStockStatusID
              */
             fe.setFStockStatusID("KCZT01_SYS");
             fEntity.add(fe);
+        }
         salOutStock.setFEntity(fEntity);
         return salOutStock;
     }
@@ -579,19 +655,19 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
         bv.setModelId(ProcDefEnum.BASEACCADJAPPLY.getProDefId());
         List<BaseInternalPurchaseVehicle> baseInternalPurchaseVehicles = query.getBaseInternalPurchaseVehicles();
         Boolean i = false;
-        if (baseInternalPurchaseVehicles.size() > 0){
+        if (baseInternalPurchaseVehicles.size() > 0) {
             for (BaseInternalPurchaseVehicle baseInternalPurchaseVehicle : baseInternalPurchaseVehicles) {
                 String witPinMoney = baseInternalPurchaseVehicle.getWitPinMoney();
                 String sid = baseInternalPurchaseVehicle.getSid();
                 BaseInternalPurchaseVehicle baseInternalPurchaseVehicle1 = baseInternalPurchaseVehicleService.fetchBySid(sid);
                 String witPinMoney1 = baseInternalPurchaseVehicle1.getWitPinMoney();
-                if (!witPinMoney.equals(witPinMoney1)){
+                if (!witPinMoney.equals(witPinMoney1)) {
                     i = true;
                     break;
                 }
             }
         }
-        bv.getFormVariables().put("isAdj",i);
+        bv.getFormVariables().put("isAdj", i);
         ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv);
         //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
         List<GetNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList());

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java

@@ -581,7 +581,6 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
                 messageFlowableQuery.setMsgContent(baseOutsourcingApplication.getCreateByName()+"提交的"+messageFlowableQuery.getModuleName()+",请审批");
                 messageFlowableQuery.setMsgTitle("供应链");
                 ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
-//                String msgSid = getMessage(uff, appMap, baseOutsourcingApplication);
                 //======================添加消息推送结束
             }
 

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderService.java

@@ -264,6 +264,7 @@ public class BusVehicleOrderService extends MybatisBaseService<BusVehicleOrderMa
                 scmApplyInbound.setInsideCode(busVehicleApplyDetail.getInsideCode());
                 scmApplyInbound.setManPurOrderTypeKey(ManPurOrderType.ManOrderType.PC_ORDER.getCode());
                 scmApplyInbound.setManPurOrderTypeValue(ManPurOrderType.ManOrderType.PC_ORDER.getRemarks());
+                scmApplyInbound.setUseOrgSid(dto.getCreateOrgSid());
                 scmApplyInboundFeign.saveOrUpdateApplyInBound(scmApplyInbound);
             }
             return rb.success();