Merge remote-tracking branch 'origin/master'

3 years ago · a261b8b5fb
3 changed files with 37 additions and 12 deletions
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateFeign.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateFeign.java
@ -25,16 +25,14 @@
 *********************************************************/
 package com.yxt.anrui.base.api.basevehicletempstate;

-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;

-import java.util.List;
-
 /**
 * Project: comc(comc) <br/>
 * File: BaseVehicleTempstateFeign.java <br/>
@ -79,5 +77,5 @@ public interface BaseVehicleTempstateFeign {
    @ApiOperation("根据业务sid删除记录")
    @DeleteMapping("/delByBusSid")
    @ResponseBody
-    public ResultBean delByBusSid(String businessSid);
+    public ResultBean delByBusSid(@RequestParam("businessSid") String businessSid);
 }
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java
@ -379,11 +379,11 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
                    String witPinMoney1 = baseInternalPurchaseVehicle1.getWitPinMoney();
                    if (!witPinMoney.equals(witPinMoney1)) {
                        i = true;
-                        baseInternalPurchaseVehicleService.updateWitPinMoneyBySid(witPinMoney,sid);
+                        baseInternalPurchaseVehicleService.updateWitPinMoneyBySid(witPinMoney, sid);
                    }
                }
            }
-        }else {
+        } else {
            for (String s : purchaseSids) {
                BaseInternalPurchaseVehicle baseInternalPurchaseVehicle = baseInternalPurchaseVehicleService.fetchBySid(s);
                String witPinMoney = baseInternalPurchaseVehicle.getWitPinMoney();
@ -399,6 +399,8 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
        if (formVariables == null) {
            map.put("isAdj", i);
            bv.setFormVariables(map);
+        }else {
+            formVariables.put("isAdj", i);
        }
        if (bv.getTaskId().equals(baseAccadjApply.getTaskId())) {
            ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
@ -559,6 +561,25 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
        BaseAccadjApply baseAccadjApply = fetchBySid(bv.getBusinessSid());
        if (baseAccadjApply.getAccadjTypeValue().equals("调入")) {
            String callOutOrgSid = baseAccadjApply.getCallOutOrgSid();
+            List<String> purchaseSids = baseAccadjApplyeVehService.fetchByMainSid(baseAccadjApply.getSid());
+            Boolean i = false;
+            for (String s : purchaseSids) {
+                BaseInternalPurchaseVehicle baseInternalPurchaseVehicle = baseInternalPurchaseVehicleService.fetchBySid(s);
+                String witPinMoney = baseInternalPurchaseVehicle.getWitPinMoney();
+                String initialWitPinMoney = baseInternalPurchaseVehicle.getInitialWitPinMoney();
+                if (!witPinMoney.equals(initialWitPinMoney)) {
+                    i = true;
+                    break;
+                }
+            }
+            Map<String, Object> map = new HashMap<>();
+            Map<String, Object> formVariables = bv.getFormVariables();
+            if (formVariables == null) {
+                map.put("isAdj", i);
+                bv.setFormVariables(map);
+            }else {
+                formVariables.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());
@ -678,7 +699,7 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
                    }
                }
            }
-        }else {
+        } else {
            List<String> stringList = baseAccadjApplyeVehService.fetchByMainSid(query.getSid());
            for (String s : stringList) {
                BaseInternalPurchaseVehicle baseInternalPurchaseVehicle = baseInternalPurchaseVehicleService.fetchBySid(s);
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java
@ -850,6 +850,7 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
     */
    public ResultBean complete(BusinessVariables bv) {
        ResultBean rb = ResultBean.fireFail();
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
        ScmVehicleGression scmVehicleGression = fetchBySid(bv.getBusinessSid());
        Map<String, Object> variables = new HashMap<>();
        Map<String, Object> appMap = new HashMap<>();
@ -872,7 +873,6 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
            UpdateFlowFieldVo ufVo = resultBean.getData();
            updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
            if (!"Event_end".equals(ufVo.getTaskDefKey())) {
-                SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
                //极光推送
                scmVehicleGression = fetchBySid(bv.getBusinessSid());
                ufVo.setProcInsId(scmVehicleGression.getProcInstId());
@ -887,6 +887,8 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
                messageFlowableQuery.setMsgContent(scmVehicleGression.getApplicantName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
                messageFlowableQuery.setMsgTitle("供应链");
                ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
+
+            }else{
                //推送车辆台账数据
                VehicleGression vehicleGression = new VehicleGression();
                List<String> list = scmVehicleGressionVehService.fetchVoByMainSid(scmVehicleGression.getSid());
@ -926,6 +928,8 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
                        fBillEntry.setFDestStockId("CK003");//调入仓库
                        fBillEntry.setFMaterialId(s);//物料编码
                        fBillEntry.setFSrcStockId("CK001");//调出仓库
+                        fBillEntry.setFLot(s);
+                        fBillEntry.setFDestLot(s);
                        FPAYBILLENTRYs.add(fBillEntry);
                        stkTransferDirect.setFBillEntry(FPAYBILLENTRYs);
                        finKingDeeFeign.draftStkTransferDirect(stkTransferDirect);
@ -1162,9 +1166,11 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
        temporaryExitPermitInfo.setOrgName(sysOrganization.getName());
        temporaryExitPermitInfo.setDate(new Date());
        temporaryExitPermitInfo.setContractNo("—");
-        BaseVehicleSelectVo data = baseVehicleFeign.details(scmVehicleGression.getVehicleSid()).getData();
-        ExiCarConfigDetailVo exiCarConfigDetailVo = baseVehicleFeign.selectExiCarConfig(data.getModelSid(), data.getModelConfigSid(), data.getVehModelConfigSid()).getData();
-        temporaryExitPermitInfo.setModelName(exiCarConfigDetailVo.getVehicleAlias() + exiCarConfigDetailVo.getCarColor());
+        if(StringUtils.isNotBlank(scmVehicleGression.getVehicleSid())){
+            BaseVehicleSelectVo data = baseVehicleFeign.details(scmVehicleGression.getVehicleSid()).getData();
+            ExiCarConfigDetailVo exiCarConfigDetailVo = baseVehicleFeign.selectExiCarConfig(data.getModelSid(), data.getModelConfigSid(), data.getVehModelConfigSid()).getData();
+            temporaryExitPermitInfo.setModelName(exiCarConfigDetailVo.getVehicleAlias() + exiCarConfigDetailVo.getCarColor());
+        }
        temporaryExitPermitInfo.setNum("1");
        temporaryExitPermitInfo.setVinNo(scmVehicleGression.getVinNo());
        temporaryExitPermitInfo.setReason("存放地点变更");