价格管理

sto/src/main/java/com/shinsoft/sto/mapper/main/CargoMapper.xml

@@ -27,6 +27,7 @@
         <result column="customer_id" property="customerId" jdbcType="VARCHAR"/>
         <result column="sum_weight" property="sumWeight" jdbcType="NUMERIC"/>
         <result column="use_weight" property="useWeight" jdbcType="NUMERIC"/>
+        <result column="enable_status" property="enableStatus" jdbcType="VARCHAR"/>
 
         <!-- 关联上游客户信息 -->
         <association property="uperCustomer" javaType="com.shinsoft.sto.model.main.Customer">
@@ -47,7 +48,7 @@
         c.id, c.process_instance_id, c.process_instance_status, c.add_id, c.add_code, c.add_name,
         c.add_dept_id, c.add_dept_code, c.add_dept_name, c.add_time, c.modify_id, c.modify_code, c.modify_name,
         c.modify_time, c.cancel_id, c.cancel_code, c.cancel_name, c.cancel_time, c.cancel_flag,
-        c.belong_id, c.uper_customer_id, c.customer_id, c.sum_weight, c.use_weight,
+        c.belong_id, c.uper_customer_id, c.customer_id, c.sum_weight, c.use_weight, c.enable_status,
         uper.customer_nm as uper_customer_nm, uper.customer_short_nm as uper_customer_short_nm,
         cust.customer_nm as customer_nm, cust.customer_short_nm as customer_short_nm
     </sql>

sto/src/main/java/com/shinsoft/sto/model/main/Cargo.java

@@ -30,6 +30,9 @@ public class Cargo extends BaseModel {
     @ApiModelProperty("使用重量")
     private BigDecimal useWeight = BigDecimal.ZERO;
 
+    @ApiModelProperty("启用状态，0未启用，1启用")
+    private String enableStatus = "0";
+
     // 关联上游客户信息
     @TableField(exist = false)
     @ApiModelProperty("上游客户信息")

sto/src/main/java/com/shinsoft/sto/service/impl/main/CargoServiceImp.java

@@ -59,6 +59,7 @@ public class CargoServiceImp extends ServiceImpl<CargoMapper, Cargo> implements
         }
         return resultJSON;
     }
+
     @Override
     public ResultJSON queryByPK(String id) {
         try {
@@ -70,30 +71,6 @@ public class CargoServiceImp extends ServiceImpl<CargoMapper, Cargo> implements
         }
         return resultJSON;
     }
-    @Override
-    public ResultJSON save(String userId, String json) {
-        try {
-            Date date = new Date();
-            Cargo cargo = JSON.parseObject(json, new TypeReference<Cargo>() {});
-
-            if (StringUtils.isEmpty(cargo.getId())) {
-                cargo.setCancelFlag("0");
-                cargo.setAddId(userId);
-                cargo.setAddTime(date);
-                cargoMapper.insert(cargo);
-            } else {
-                cargo.setModifyId(userId);
-                cargo.setModifyTime(date);
-                cargoMapper.updateById(cargo);
-            }
-
-            resultJSON = JSONTools.toResultJSON(cargo);
-        } catch (Exception ex) {
-            ex.printStackTrace();
-            resultJSON = JSONTools.toResultJSON(ResponseCodeMsg.CODE_EX, ex);
-        }
-        return resultJSON;
-    }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -103,6 +80,7 @@ public class CargoServiceImp extends ServiceImpl<CargoMapper, Cargo> implements
             // 解析前端传递的数据
             Map<String, Object> formData = JSON.parseObject(json, new TypeReference<Map<String, Object>>() {});
 
+            String id = (String) formData.get("id");
             String uperCustomerId = (String) formData.get("uperCustomerId");
             String customerId = (String) formData.get("customerId");
             String subStr = (String) formData.get("subStr"); // 增加/减少
@@ -118,25 +96,25 @@ public class CargoServiceImp extends ServiceImpl<CargoMapper, Cargo> implements
             Cargo existingCargo = cargoMapper.selectOne(queryWrapper);
 
             Cargo cargo;
+            boolean isNewRecord = false;
+
             if (existingCargo == null) {
                 // 新增记录
+                isNewRecord = true;
                 cargo = new Cargo();
                 cargo.setId(UUID.randomUUID().toString().replace("-", ""));
                 cargo.setUperCustomerId(uperCustomerId);
                 cargo.setCustomerId(customerId);
+                cargo.setEnableStatus("0"); // 新增记录默认未启用
 
                 if ("增加".equals(subStr)) {
-                    // 新增+增加：可使用量=0+重量，已使用量=0
+                    // 新增+增加：可使用量=重量，已使用量=0
                     cargo.setSumWeight(weight);
                     cargo.setUseWeight(BigDecimal.ZERO);
-                } else if ("减少".equals(subStr)) {
+                } else {
                     // 新增+减少：不允许，因为不能从0减少
                     resultJSON = JSONTools.toResultJSON(ResponseCodeMsg.CODE_EX, "无法对不存在的记录进行减少操作");
                     return resultJSON;
-                } else {
-                    // 默认新增：可使用量=0+重量，已使用量=0
-                    cargo.setSumWeight(weight);
-                    cargo.setUseWeight(BigDecimal.ZERO);
                 }
 
                 cargo.setCancelFlag("0");
@@ -146,6 +124,24 @@ public class CargoServiceImp extends ServiceImpl<CargoMapper, Cargo> implements
             } else {
                 // 更新现有记录
                 cargo = existingCargo;
+
+                // 检查减少操作的合法性
+                if ("减少".equals(subStr)) {
+                    // 检查启用状态和可使用量
+                    if ("1".equals(cargo.getEnableStatus()) &&
+                            (cargo.getSumWeight() == null || cargo.getSumWeight().compareTo(BigDecimal.ZERO) == 0)) {
+                        resultJSON = JSONTools.toResultJSON(ResponseCodeMsg.CODE_EX, "当前记录已启用且可使用量为0，不能进行减少操作");
+                        return resultJSON;
+                    }
+
+                    // 检查减少的重量是否大于当前可使用量
+                    BigDecimal oldSumWeight = cargo.getSumWeight() != null ? cargo.getSumWeight() : BigDecimal.ZERO;
+                    if (oldSumWeight.compareTo(weight) < 0) {
+                        resultJSON = JSONTools.toResultJSON(ResponseCodeMsg.CODE_EX, "减少的重量不能大于当前可使用量");
+                        return resultJSON;
+                    }
+                }
+
                 BigDecimal oldSumWeight = cargo.getSumWeight() != null ? cargo.getSumWeight() : BigDecimal.ZERO;
                 BigDecimal oldUseWeight = cargo.getUseWeight() != null ? cargo.getUseWeight() : BigDecimal.ZERO;
 
@@ -153,13 +149,8 @@ public class CargoServiceImp extends ServiceImpl<CargoMapper, Cargo> implements
                     // 增加：可使用量=原可使用量+重量，已使用量不变
                     cargo.setSumWeight(oldSumWeight.add(weight));
                 } else if ("减少".equals(subStr)) {
-                    // 减少：可使用量=原可使用量-重量，已使用量=0+重量
-                    if (oldSumWeight.compareTo(weight) < 0) {
-                        resultJSON = JSONTools.toResultJSON(ResponseCodeMsg.CODE_EX, "减少的重量不能大于当前可使用量");
-                        return resultJSON;
-                    }
+                    // 减少：可使用量=原可使用量-重量，已使用量不变
                     cargo.setSumWeight(oldSumWeight.subtract(weight));
-                    cargo.setUseWeight(oldUseWeight.add(weight));
                 }
 
                 cargo.setModifyId(userId);
@@ -180,8 +171,6 @@ public class CargoServiceImp extends ServiceImpl<CargoMapper, Cargo> implements
             changeRecord.setCancelFlag("0");
             changeRecord.setAddId(userId);
             changeRecord.setAddTime(date);
-            changeRecord.setModifyId(userId);
-            changeRecord.setModifyTime(date);
             cargoChangeRecordMapper.insert(changeRecord);
 
             resultJSON = JSONTools.toResultJSON(cargo);
@@ -191,13 +180,26 @@ public class CargoServiceImp extends ServiceImpl<CargoMapper, Cargo> implements
         }
         return resultJSON;
     }
-   /* @Override
+
+    @Override
     public ResultJSON save(String userId, String json) {
         try {
             Date date = new Date();
             Cargo cargo = JSON.parseObject(json, new TypeReference<Cargo>() {});
 
             if (StringUtils.isEmpty(cargo.getId())) {
+                // 新增时检查是否已存在相同上游客户和客户的记录
+                QueryWrapper<Cargo> queryWrapper = new QueryWrapper<>();
+                queryWrapper.eq("uper_customer_id", cargo.getUperCustomerId())
+                        .eq("customer_id", cargo.getCustomerId())
+                        .eq("cancel_flag", "0");
+                Cargo existingCargo = cargoMapper.selectOne(queryWrapper);
+
+                if (existingCargo != null) {
+                    resultJSON = JSONTools.toResultJSON(ResponseCodeMsg.CODE_EX, "该上游客户和客户组合的货权记录已存在");
+                    return resultJSON;
+                }
+
                 cargo.setCancelFlag("0");
                 cargo.setAddId(userId);
                 cargo.setAddTime(date);
@@ -216,21 +218,6 @@ public class CargoServiceImp extends ServiceImpl<CargoMapper, Cargo> implements
         return resultJSON;
     }
 
-    @Override
-    public ResultJSON transfer(String userId, String json) {
-        try {
-            Date date = new Date();
-            Cargo cargo = JSON.parseObject(json, new TypeReference<Cargo>() {});
-            // 这里实现货权转移逻辑，包括记录变更履历
-            // 具体实现根据业务需求来写
-            resultJSON = JSONTools.toResultJSON(cargo);
-        } catch (Exception ex) {
-            ex.printStackTrace();
-            resultJSON = JSONTools.toResultJSON(ResponseCodeMsg.CODE_EX, ex);
-        }
-        return resultJSON;
-    }*/
-
     @Override
     public ResultJSON remove(String userId, String id) {
         try {