问题修改

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<BaseInternal
                 //更新业务中的流程相关的参数
                 updateFlowFiled(map);
                 String nodeState = map.get("nodeState").toString();
-                if (nodeState.equals("调车申请")) {
+                if (nodeState.equals("发起申请")) {
                     List<BaseInternalPurchaseVehicleVo> 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<BaseInternal
                 Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
                 updateFlowFiled(map);
                 String nodeState = map.get("nodeState").toString();
-                if (nodeState.equals("调车申请")) {
+                if (nodeState.equals("发起申请")) {
                     List<BaseInternalPurchaseVehicleVo> baseInternalPurchaseVehicleVos = baseInternalPurchaseVehicleService.fetchByMainSid(query.getBusinessSid());
                     for (BaseInternalPurchaseVehicleVo baseInternalPurchaseVehicleVo : baseInternalPurchaseVehicleVos) {
                         baseVehicleService.updateVehicleState(VehicleState.StockEnum.STOCK.getCode(), VehicleState.StockEnum.STOCK.getRemarks(), baseInternalPurchaseVehicleVo.getVinNo(), baseInternalPurchase.getCreateOrgSid());

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 = ""
     </select>
     <!--根据厂商名称查重-->
     <select id="selectCountByName" resultType="int">

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java

@@ -124,8 +124,8 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
             }
         }
         qw.eq("bm.isDelete", 0);
-        qw.eq("bm.supplierType", 0001);
-        qw.and(wrapper -> wrapper.eq("bm.manBankSid", null).or().eq("bm.manBankSid", ""));
+        qw.eq("bm.supplierType", "0001");
+        qw.and(wrapper -> wrapper.isNull("bm.manBankSid").or().eq("bm.manBankSid", ""));
         return qw;
     }
 

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java

@@ -451,6 +451,7 @@ public class BaseVehicleRest implements BaseVehicleFeign {
         if (!isTrue) {
             return rb.setMsg("修改失败");
         }
+        baseVehicleCertificateService.updateVinNoByVehSid(baseVehicle.getVinNo(),sid);
         return rb.success().setMsg("修改成功");
     }
 

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateMapper.java

@@ -96,4 +96,6 @@ public interface BaseVehicleCertificateMapper extends BaseMapper<BaseVehicleCert
     BaseVehicleCertificateVo selectByVinNoAndOrgSid(@Param("vinNo") String vinNo,@Param("createOrgSid") String createOrgSid);
 
     List<BaseVehicleCertificateDetailsVo> selectByOrgSid(String createOrgSid);
+
+    void updateVinNoByVehSid(@Param("vinNo") String vinNo,@Param("sid") String sid);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateMapper.xml

@@ -231,4 +231,11 @@
                         OR bvc.transferStateKey = "001"
                 )
     </select>
+
+    <update id="updateVinNoByVehSid">
+        UPDATE
+                base_vehicle_certificate
+        SET vinNo = #{vinNo}
+        WHERE vehicleSid = #{sid}
+    </update>
 </mapper>

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<BaseVehicl
         List<BaseVehicleCertificateDetailsVo> baseVehicleCertificateDetails = baseMapper.selectByOrgSid(createOrgSid);
         return rb.success().setData(baseVehicleCertificateDetails);
     }
+
+    public void updateVinNoByVehSid(String vinNo, String sid) {
+        baseMapper.updateVinNoByVehSid(vinNo,sid);
+    }
 }

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"),

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<ScmVehicleReturn
                 return ResultBean.fireFail().setMsg(resultBean.getMsg());
             }
             Map<String, Object> stringObjectMap = BeanUtil.beanToMap(resultBean.getData());
-            if (stringObjectMap.get("nodeState").equals("采购退库申请")){
+            if (stringObjectMap.get("nodeState").equals("发起申请")){
                 List<ScmVehicleReturnDetails> scmVehicleReturnDetails = scmVehicleReturnDetailsService.selectByReturnSid(flowTaskVo.getBusinessSid());
                 List<BaseVehicleDto> baseVehicleDtos = new ArrayList<>();
                 for (ScmVehicleReturnDetails scmVehicleReturnDetail : scmVehicleReturnDetails) {