From e31b53b99a3fc26ea81aa817574d55f98f7ded5f Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Sat, 15 Oct 2022 14:02:14 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../baseinternalpurchase/BaseInternalPurchaseService.java | 4 ++-- .../base/biz/basemanufacturer/BaseManufacturerMapper.xml | 1 - .../biz/basemanufacturer/BaseManufacturerService.java | 4 ++-- .../yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java | 1 + .../BaseVehicleCertificateMapper.java | 2 ++ .../BaseVehicleCertificateMapper.xml | 7 +++++++ .../BaseVehicleCertificateService.java | 4 ++++ .../com/yxt/anrui/flowable/api/utils/ProcDefEnum.java | 8 ++++---- .../scm/biz/scmvehiclereturn/ScmVehicleReturnService.java | 2 +- 9 files changed, 23 insertions(+), 10 deletions(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java index e07e19a8bc..c11b06e327 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java @@ -754,7 +754,7 @@ public class BaseInternalPurchaseService extends MybatisBaseService baseInternalPurchaseVehicleVos = baseInternalPurchaseVehicleService.fetchByMainSid(query.getBusinessSid()); for (BaseInternalPurchaseVehicleVo baseInternalPurchaseVehicleVo : baseInternalPurchaseVehicleVos) { baseVehicleService.updateVehicleState(VehicleState.StockEnum.STOCK.getCode(), VehicleState.StockEnum.STOCK.getRemarks(), baseInternalPurchaseVehicleVo.getVinNo(), baseInternalPurchase.getCreateOrgSid()); @@ -811,7 +811,7 @@ public class BaseInternalPurchaseService extends MybatisBaseService map = BeanUtil.beanToMap(resultBean.getData()); updateFlowFiled(map); String nodeState = map.get("nodeState").toString(); - if (nodeState.equals("调车申请")) { + if (nodeState.equals("发起申请")) { List baseInternalPurchaseVehicleVos = baseInternalPurchaseVehicleService.fetchByMainSid(query.getBusinessSid()); for (BaseInternalPurchaseVehicleVo baseInternalPurchaseVehicleVo : baseInternalPurchaseVehicleVos) { baseVehicleService.updateVehicleState(VehicleState.StockEnum.STOCK.getCode(), VehicleState.StockEnum.STOCK.getRemarks(), baseInternalPurchaseVehicleVo.getVinNo(), baseInternalPurchase.getCreateOrgSid()); diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml index 280ffac0a4..a931a6362a 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml @@ -20,7 +20,6 @@ bm.manufacturerCode FROM base_manufacturer bm ${ew.customSqlSegment} - AND bm.createOrg IS NULL OR bm.createOrg = "" + + + UPDATE + base_vehicle_certificate + SET vinNo = #{vinNo} + WHERE vehicleSid = #{sid} + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateService.java index e6d8ea46b4..340b418fea 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateService.java @@ -178,4 +178,8 @@ public class BaseVehicleCertificateService extends MybatisBaseService baseVehicleCertificateDetails = baseMapper.selectByOrgSid(createOrgSid); return rb.success().setData(baseVehicleCertificateDetails); } + + public void updateVinNoByVehSid(String vinNo, String sid) { + baseMapper.updateVinNoByVehSid(vinNo,sid); + } } \ No newline at end of file diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java index 0cb1b983aa..b8da1b3ef6 100644 --- a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java +++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java @@ -17,15 +17,15 @@ public enum ProcDefEnum { // VEHICLEAPPLY("排产申请流程", "process_9egcg169:7:467504"),//TODO VEHICLEAPPLY("排产申请流程", "process_9egcg169:10:657508"),//TODO // RECORDAPPLICATION("入账申请", "record_application_7y80d4r8:1:265008"),//TODO - RECORDAPPLICATION("入库申请", "process_xbwq2c7p:1:530004"),//TODO - SCMVEHICLERETURN("采购退库", "process_md8aeoap:4:392512"), + RECORDAPPLICATION("入库申请", "process_xbwq2c7p:3:675024"),//TODO + SCMVEHICLERETURN("采购退库", "process_md8aeoap:1:675008"), SEALAPPLY("盖章申请", "process_7h0z66tp:1:240064" ), BASEVEHICLEACTUALSALES("未售买断", "process_6qx07b75:6:457504"),//ToDo // SALESORDER("销售订单审批流程", "process_p5ils2rn:4:490008"), SALESORDER("销售订单审批流程", "process_p5ils2rn:5:557508"), - BASEOUTSOURCINGAPPLICATION("外采申请", "process_5tqysnjc:4:495004"),//TODO + BASEOUTSOURCINGAPPLICATION("外采申请", "process_5tqysnjc:4:675004"),//TODO BASEMODELMODPRICE("车型调价申请", "process_kydcif7k:6:505004"), - BASEINTERNALPURCHASE("调车申请", "process_i6luw5xq:1:497508"), + BASEINTERNALPURCHASE("调车申请", "process_i6luw5xq:2:675012"), SCMCARTRANSFER("库存地点变更申请", "process_3bc4p2em:6:510004"), //TODO FINCOSTAPPLY("费用申请","process_u0pahv0s:5:457512"), FINPAYAPPLY("付款申请","process_gin2tntb:3:457508"), diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnService.java index 92b8301734..6f27fa0888 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnService.java @@ -598,7 +598,7 @@ public class ScmVehicleReturnService extends MybatisBaseService stringObjectMap = BeanUtil.beanToMap(resultBean.getData()); - if (stringObjectMap.get("nodeState").equals("采购退库申请")){ + if (stringObjectMap.get("nodeState").equals("发起申请")){ List scmVehicleReturnDetails = scmVehicleReturnDetailsService.selectByReturnSid(flowTaskVo.getBusinessSid()); List baseVehicleDtos = new ArrayList<>(); for (ScmVehicleReturnDetails scmVehicleReturnDetail : scmVehicleReturnDetails) {