调账流程问题修改

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

@@ -22,6 +22,9 @@ public class GetNodeQuery implements Query {
     @NotBlank(message = "参数错误：taskDefKey")
     private String taskDefKey;
 
+    @ApiModelProperty(value = "调账申请sid")
+    private String sid;
+
     @ApiModelProperty("调账车辆列表")
     private List<BaseInternalPurchaseVehicle> baseInternalPurchaseVehicles; // 调账车辆列表
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchasevehicle/BaseInternalPurchaseVehicle.java

@@ -72,6 +72,8 @@ public class BaseInternalPurchaseVehicle extends BaseEntity {
     private String inventoryLocationName; // 库存地点名称
     @ApiModelProperty("内销价格")
     private String witPinMoney; // 内销价格
+    @ApiModelProperty("初始内销价格")
+    private String initialWitPinMoney; // 初始内销价格
     @ApiModelProperty("发票类型key")
     private String invoiceTypeKey; // 发票类型key
     @ApiModelProperty("发票类型value")

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchasevehicle/BaseInternalPurchaseVehicleDetailsVo.java

@@ -69,6 +69,8 @@ public class BaseInternalPurchaseVehicleDetailsVo implements Vo {
     private String inventoryLocationName; // 库存地点名称
     @ApiModelProperty("内销价格")
     private String witPinMoney; // 内销价格
+    @ApiModelProperty("初始内销价格")
+    private String initialWitPinMoney; // 初始内销价格
     @ApiModelProperty("发票类型key")
     private String invoiceTypeKey; // 发票类型key
     @ApiModelProperty("发票类型value")

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchasevehicle/BaseInternalPurchaseVehicleDto.java

@@ -73,6 +73,8 @@ public class BaseInternalPurchaseVehicleDto implements Dto {
     private String inventoryLocationName; // 库存地点名称
     @ApiModelProperty("内销价格")
     private String witPinMoney; // 内销价格
+    @ApiModelProperty("初始内销价格")
+    private String initialWitPinMoney; // 初始内销价格
     @ApiModelProperty("发票类型key")
     private String invoiceTypeKey; // 发票类型key
     @ApiModelProperty("发票类型value")

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchasevehicle/BaseInternalPurchaseVehicleVo.java

@@ -73,6 +73,8 @@ public class BaseInternalPurchaseVehicleVo implements Vo {
     private String inventoryLocationName; // 库存地点名称
     @ApiModelProperty("内销价格")
     private String witPinMoney; // 内销价格
+    @ApiModelProperty("初始内销价格")
+    private String initialWitPinMoney; // 初始内销价格
     @ApiModelProperty("发票类型key")
     private String invoiceTypeKey; // 发票类型key
     @ApiModelProperty("发票类型value")

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

@@ -379,10 +379,20 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
                     String witPinMoney1 = baseInternalPurchaseVehicle1.getWitPinMoney();
                     if (!witPinMoney.equals(witPinMoney1)) {
                         i = true;
-                        break;
+                        baseInternalPurchaseVehicleService.updateWitPinMoneyBySid(witPinMoney,sid);
                     }
                 }
             }
+        }else {
+            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();
@@ -668,8 +678,19 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
                     }
                 }
             }
-            bv.getFormVariables().put("isAdj", i);
+        }else {
+            List<String> stringList = baseAccadjApplyeVehService.fetchByMainSid(query.getSid());
+            for (String s : stringList) {
+                BaseInternalPurchaseVehicle baseInternalPurchaseVehicle = baseInternalPurchaseVehicleService.fetchBySid(s);
+                String witPinMoney = baseInternalPurchaseVehicle.getWitPinMoney();
+                String initialWitPinMoney = baseInternalPurchaseVehicle.getInitialWitPinMoney();
+                if (!witPinMoney.equals(initialWitPinMoney)) {
+                    i = true;
+                    break;
+                }
+            }
         }
+        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/baseinternalpurchase/BaseInternalPurchaseService.java

@@ -239,6 +239,7 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
                 baseInternalPurchaseVehicle1.setRecallStateValue(VehicleState.RecallState.UN_RECALL.getRemarks());
                 baseInternalPurchaseVehicle1.setIsAccadj("0");
                 baseInternalPurchaseVehicle1.setIsInvoicing("0");
+                baseInternalPurchaseVehicle1.setInitialWitPinMoney(baseInternalPurchaseVehicle1.getWitPinMoney());
                 baseInternalPurchaseVehicleService.save(baseInternalPurchaseVehicle1);
             }
             return rb.success().setMsg("保存成功").setData(baseInternalPurchase.getSid());

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchasevehicle/BaseInternalPurchaseVehicleMapper.java

@@ -81,4 +81,7 @@ public interface BaseInternalPurchaseVehicleMapper extends BaseMapper<BaseIntern
 	void updateIsInvoicing(@Param("purchaseSid") String purchaseSid,@Param("isInvoicing") String isInvoicing);
 
     List<AppCompanyShuntingListVo> getListBySid(String sid);
+
+	@Update("update base_internal_purchase_vehicle set witPinMoney = #{witPinMoney} where sid = #{sid}")
+    void updateWitPinMoneyBySid(@Param("witPinMoney") String witPinMoney,@Param("sid") String sid);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchasevehicle/BaseInternalPurchaseVehicleService.java

@@ -129,4 +129,8 @@ public class BaseInternalPurchaseVehicleService extends MybatisBaseService<BaseI
 	public List<AppCompanyShuntingListVo> getListBySid(String sid) {
 		return baseMapper.getListBySid(sid);
 	}
+
+	public void updateWitPinMoneyBySid(String witPinMoney,String sid) {
+		baseMapper.updateWitPinMoneyBySid(witPinMoney,sid);
+	}
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateMapper.java

@@ -64,6 +64,6 @@ public interface ScmSpecialRebateMapper extends BaseMapper<ScmSpecialRebate> {
 	@Select("select * from scm_special_rebate")
 	List<ScmSpecialRebateVo> selectListVo();
 
-	@Update("update from scm_special_rebate set state = 1 where sid = #{specialRebateSid}")
+	@Update("update scm_special_rebate set state = 1 where sid = #{specialRebateSid}")
     void updateState(String specialRebateSid);
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyRest.java

@@ -87,7 +87,7 @@ public class ScmSpecialRebateWithApplyRest implements ScmSpecialRebateWithApplyF
 
 	@Override
 	@ApiOperation("根据sid批量删除")
-    @PostMapping("/delBySids")
+    @DeleteMapping("/delBySids")
     public ResultBean delBySids(@RequestBody String[] sids){
 		return scmSpecialRebateWithApplyService.delAll(sids);
 	}

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.java

@@ -64,7 +64,7 @@ public interface ScmVehRebateMapper extends BaseMapper<ScmVehRebate> {
 	@Select("select * from scm_veh_rebate")
 	List<ScmVehRebateVo> selectListVo();
 
-	@Update("update from scm_veh_rebate set state = 1 where sid = #{sid}")
+	@Update("update scm_veh_rebate set state = 1 where sid = #{sid}")
     void updateState(String sid);
 
 	ScmVehRebateVo selectByVinNoAndOrgSid(@Param("vinNo") String vinNo,@Param("createOrgSid") String createOrgSid);