Merge remote-tracking branch 'origin/master'

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);
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java

@@ -543,8 +543,8 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
                 try {
                     /*List<BdMaterial> bdMaterials= createBdMaterialList(scmApplyInbound,scmApplyInboundVehicleDtos);
                     ResultBean r = finKingDeeFeign.draftBdMaterialList(bdMaterials);*/
-                    StkInStock stkInStock=createStkInStock(scmApplyInbound,scmApplyInboundVehicleDtos);
-                    ResultBean r1 = finKingDeeFeign.draftStkInStock(stkInStock);
+                    /*StkInStock stkInStock=createStkInStock(scmApplyInbound,scmApplyInboundVehicleDtos);
+                    ResultBean r1 = finKingDeeFeign.draftStkInStock(stkInStock);*/
                 } catch (Exception e) {
                     //return rb.setMsg("入账推送金蝶系统的应付单接口报错，主数据sid:" + scmApplyInbound.getSid());
                 }

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("—");
+        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("存放地点变更");