1.优化货权转移逻辑

2.删除前新增判断该垛位下是否存在钢板

src/main/java/com/th/demo/mapping/ware/StoreMapper.java

@@ -72,4 +72,8 @@ public interface StoreMapper {
      * 修改入库表收货地址
      */
     int  updateInAddressById(@Param( "inId") List<String> inId,@Param( "address") String  address);
+    /**
+     * 根据垛位id查询当前垛位下是否存在未出库钢板
+     */
+    List<String> queryStoreById(@Param("stackId") String stackId);
 }

src/main/java/com/th/demo/service/impl/maint/StackServiceImpl.java

@@ -7,14 +7,18 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.th.demo.mapping.maint.StackMapper;
 import com.th.demo.mapping.maint.WareMapper;
+import com.th.demo.mapping.ware.StoreMapper;
 import com.th.demo.model.maint.Stack;
 import com.th.demo.model.maint.Ware;
 import com.th.demo.model.system.Type;
+import com.th.demo.model.ware.Store;
 import com.th.demo.service.maint.StackService;
 import com.th.demo.tools.JSONTools;
 import com.th.demo.tools.Tools;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -27,6 +31,8 @@ public class StackServiceImpl implements StackService {
     public StackMapper stackMapper;
     @Autowired
     public WareMapper wareMapper;
+    @Autowired
+    public StoreMapper storeMapper;
 
 
 
@@ -76,6 +82,17 @@ public class StackServiceImpl implements StackService {
 
     @Override
     public String remove(String id, String userId) {
+        /**
+         * 2026-5-07
+         * 删除前新增判断该垛位下是否存在 ( 未出库,未删除 ) 钢板
+         * 如果存在禁止删除
+         * */
+        List<String> stores = storeMapper.queryStoreById(id);
+        if(!ObjectUtils.isEmpty(stores)){
+            String plateNos = StringUtils.join(",", stores);
+            return JSONTools.toString(1,"当前垛位下存在钢板 "+plateNos+";");
+        }
+
         Stack stack = stackMapper.selectByPrimaryKey(id);
         stack.setCancelFlag("9");
         stack.setCancelId(userId);

src/main/java/com/th/demo/service/impl/ware/ChangeServiceImpl.java

@@ -28,6 +28,7 @@ import com.th.demo.tools.Tools;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.StringUtils;
 
 import java.util.Collections;
 import java.util.Date;
@@ -53,84 +54,135 @@ public class ChangeServiceImpl implements ChangeService {
     int num = 0;
     String result = Type.FAIL;
 
-
+    /**
+     * 货权转移
+     * 解决：货权转移后Cargo重量不减少、中途return不扣重量、空指针、事务部分提交BUG
+     */
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public String changeCustomer(String json, String customer,String address,String userId, String belongId) throws Exception{
-        List<Store> list = JSON.parseObject(json, new TypeReference<List<Store>>() {});
+    public String changeCustomer(String json, String customer, String address, String userId, String belongId) throws Exception {
+        // 1. 基础参数非空校验
+        if (!StringUtils.hasText(json) || !StringUtils.hasText(customer) || !StringUtils.hasText(userId) || !StringUtils.hasText(belongId)) {
+            throw new Exception("传入参数不能为空");
+        }
+
+        // 2. 解析库存列表 & 新货主
+        List<Store> storeList = JSON.parseObject(json, new TypeReference<List<Store>>() {});
+        if (storeList == null || storeList.isEmpty()) {
+            throw new Exception("暂无需要转移的库存数据");
+        }
+
         Customer c1 = JSON.parseObject(customer, new TypeReference<Customer>() {});
-        Customer c = customerMapper.selectByPrimaryKey(c1.getId());//新货主
-        String recordType = "";
-        double sum_weight = 0;//可以进行货权转移的重量(货权转移的地方维护的)
-        double use_weight = 0;//已经使用的货权转移的重量
-        // 增加校验
-        Store store = storeMapper.selectByPrimaryKey(list.get(0).getId());
-        Customer fk_cus = customerMapper.selectByPrimaryKey(store.getCustomer().getId());//老货主
-        Cargo cargo = cargoMapper.selectByByFkAndCustomer(fk_cus.getId(),c.getId(),belongId);
-        if (cargo == null){
-            sum_weight=0;
-        }else{
-            if(cargo.getSumWeight() == 0){
-                num = 10;
-                return JSONTools.toString(1,"货权信息已维护，但可是用量为0");
-            }else {
-                sum_weight = cargo.getSumWeight();
+        if (c1 == null || c1.getId() == null) {
+            throw new Exception("新货主信息解析失败");
+        }
+
+        // 3. 查询新货主、第一条库存、老货主
+        Customer newCustomer = customerMapper.selectByPrimaryKey(c1.getId());
+        if (newCustomer == null) {
+            throw new Exception("新货主不存在");
+        }
+
+        Store firstStore = storeMapper.selectByPrimaryKey(storeList.get(0).getId());
+        if (firstStore == null || firstStore.getCustomer() == null) {
+            throw new Exception("库存信息或原货主信息不存在");
+        }
+
+        Customer oldCustomer = customerMapper.selectByPrimaryKey(firstStore.getCustomer().getId());
+        if (oldCustomer == null) {
+            throw new Exception("原货主不存在");
+        }
+
+        // 4. 查询货权配置记录
+        Cargo cargo = cargoMapper.selectByByFkAndCustomer(oldCustomer.getId(), newCustomer.getId(), belongId);
+        double sumWeight = 0;
+        if (cargo != null) {
+            sumWeight = cargo.getSumWeight();
+            // 货权可用重量为0直接拦截
+            if (sumWeight <= 0) {
+                throw new Exception("货权信息已维护，可用转移重量为0");
             }
         }
 
-        for (int i = 0; i < list.size(); i++) {
-            //保留可转移重量不为0的情况下，货权转移重量的计算
-            // 25.5.27增加规则维护货权转移信息的，只要重量为0了
-            if(sum_weight != 0 && (sum_weight-use_weight-list.get(i).getWeight()) < 0){
-                num =10;
-                return JSONTools.toString(1,"货权转移重量不足");
+        double useWeight = 0;// 已累计使用转移重量
+        int num = 0;// 数据库受影响行数 初始化
+        String recordType;
+
+        // 5. 循环逐条处理库存转移
+        for (Store store : storeList) {
+            if (store == null || store.getWeight() <= 0) {
+                continue;
             }
-            if(list.get(i).getCustomer().getName().equals(c.getName())){
+            double currentWeight = store.getWeight();
+
+            // 重量不足校验
+            if (sumWeight > 0 && (sumWeight - useWeight - currentWeight) < 0) {
+                throw new Exception("货权转移重量不足");
+            }
+
+            // 判断记录类型
+            if (newCustomer.getName().equals(store.getCustomer().getName())) {
                 recordType = "0";
-            }else {
+            } else {
                 recordType = "1";
-                AccountDetail accountDetail = getAccountDetail(list.get(i),  userId, belongId);
+                // 插入账户明细
+                AccountDetail accountDetail = getAccountDetail(store, userId, belongId);
                 num += accountDetailMapper.insert(accountDetail);
             }
-            ChangeRecord changeRecord = getChangeRecord(recordType, list.get(i), c, address, userId, belongId);
+
+            // 插入变更记录
+            ChangeRecord changeRecord = getChangeRecord(recordType, store, newCustomer, address, userId, belongId);
             num += changeRecordMapper.insert(changeRecord);
-            list.get(i).setCustomer(c);
-            list.get(i).setFkComponyId(fk_cus.getId());
-//            新增判断 地址为空不做处理 地址不为空时 0:清空地址 其他:更新地址
-            if (address!=null && !address.equals("")){
-                if(address.equals("0")){
-                    list.get(i).setReceiveAddress("");
+
+            // 修改库存归属
+            store.setCustomer(newCustomer);
+            store.setFkComponyId(oldCustomer.getId());
+
+            // 地址处理
+            if (StringUtils.hasText(address)) {
+                if ("0".equals(address)) {
+                    store.setReceiveAddress("");
                 } else {
-                    list.get(i).setReceiveAddress(address);
+                    store.setReceiveAddress(address);
                 }
             }
-            num += storeMapper.updateByPrimaryKey(list.get(i));
-            num += storeMapper.updateFkById(list.get(i));
-            use_weight = use_weight + list.get(i).getWeight();
+
+            // 更新库存
+            num += storeMapper.updateByPrimaryKey(store);
+            num += storeMapper.updateFkById(store);
+
+            // 累加已使用重量
+            useWeight += currentWeight;
+
+            // ========== 关键修复：逐条实时扣减货权重量，不放到循环外 ==========
+            if (cargo != null) {
+                cargo.setSumWeight(cargo.getSumWeight() - currentWeight);
+                cargo.setUseWeight(cargo.getUseWeight() + currentWeight);
+                // 立即更新数据库，每处理一条扣一条，避免中途中断完全不扣
+                num += cargoMapper.updateByPrimaryKey(cargo);
+            }
         }
-        if (cargo != null){
-            cargo.setSumWeight(cargo.getSumWeight() - use_weight);
-            cargo.setUseWeight(cargo.getUseWeight() + use_weight);
-            num = cargoMapper.updateByPrimaryKey(cargo);
 
+        // 6. 批量处理完后 插入货权变更记录
+        if (cargo != null && useWeight > 0) {
             CargoChangeRecord cargoChangeRecord = new CargoChangeRecord();
             cargoChangeRecord.setUperCustomer(cargo.getUperCustomer());
             cargoChangeRecord.setCustomer(cargo.getCustomer());
             cargoChangeRecord.setChangeFrom("货权转移");
-            cargoChangeRecord.setWeight(use_weight);
+            cargoChangeRecord.setWeight(useWeight);
             cargoChangeRecord.setSubStr("减少");
-
             cargoChangeRecord.setModifyTime(new Date());
             cargoChangeRecord.setModifyUser(new SysUser(userId));
-            num = cargoChangeRecordMapper.insert(cargoChangeRecord);
-
+//            cargoChangeRecord.setCancelFlag("0");
+            num += cargoChangeRecordMapper.insert(cargoChangeRecord);
         }
-        result = Tools.moreThanZeroResultJSON(num);
-        return result;
+
+        // 7. 返回结果
+        return Tools.moreThanZeroResultJSON(num);
     }
 
-    private ChangeRecord getChangeRecord(String recordType, Store store, Customer customer, String receiveAddress, String userId, String belongId) {
 
+    private ChangeRecord getChangeRecord(String recordType, Store store, Customer customer, String receiveAddress, String userId, String belongId) {
         ChangeRecord record = new ChangeRecord();
         record.setRecordType(recordType);
         record.setWareName(store.getWare().getName());
@@ -139,9 +191,9 @@ public class ChangeServiceImpl implements ChangeService {
         record.setMaterialName(store.getMaterial().getName());
         record.setStandard(store.getMaterial().getStandard());
         record.setModel(store.getModel());
-        if(customer==null) {
+        if (customer == null) {
             record.setCustomerNameNew("");
-        }else {
+        } else {
             record.setCustomerNameNew(customer.getName());
         }
         record.setCustomerNameOld(store.getCustomer().getName());
@@ -159,25 +211,18 @@ public class ChangeServiceImpl implements ChangeService {
         return record;
     }
 
-    private AccountDetail getAccountDetail(Store store,  String userId, String belongId) throws Exception {
+    private AccountDetail getAccountDetail(Store store, String userId, String belongId) throws Exception {
         int changeTime = 0;
         int changeTimeForPrice = 0;
-        Double plateSuttle = 0.0;
         Double storagePrice = 0.0;
         Double weightPrice = 0.0;
 
         List<ChangeRecord> list = changeRecordMapper.selectByPlantNoForAccount(store.getPlateNo(), belongId);
-        if (list == null || list.size() == 0) {
-            changeTime = 0;
-            changeTimeForPrice = 0;
-        } else {
+        if (list != null && !list.isEmpty()) {
             changeTime = list.size();
             changeTimeForPrice = 1;
         }
-       /* Price price = priceMapper.selectByMaterialChangeTime(store.getMaterial().getId(), changeTimeForPrice, belongId);
-        if (price == null) {
-            throw new Exception(store.getMaterial().getName() + "," + store.getMaterial().getStandard() + "没有对应价格信息");
-        }*/
+
         AccountDetail accountDetail = new AccountDetail();
         accountDetail.setChangeTime(changeTime);
         accountDetail.setRecordType("货权转移");
@@ -198,21 +243,12 @@ public class ChangeServiceImpl implements ChangeService {
         accountDetail.setCancelFlag("0");
         accountDetail.setBelongId(belongId);
 
-        //storagePrice = price.getStoragePrice() * store.getWeight();
-
-        //accountDetail.setStorageUnitPrice(price.getStoragePrice());
         accountDetail.setStoragePrice(storagePrice);
-
-        //accountDetail.setWeightUnitPrice(price.getWeightPrice());
         accountDetail.setWeightPrice(0.0);
         accountDetail.setSuttle(0.0);
-
         accountDetail.setReduceUnitPrice(0.0);
         accountDetail.setReducePrice(0.0);
-
-        accountDetail.setTotalPrice(storagePrice+weightPrice);
-
-
+        accountDetail.setTotalPrice(storagePrice + weightPrice);
         return accountDetail;
     }
 

src/main/java/com/th/demo/service/impl/ware/OutServiceImpl.java

@@ -363,7 +363,7 @@ public class OutServiceImpl implements OutService {
     /**
      * 库存状态检测方法(定时)
      */
-    @Scheduled(cron = "0 * * * * *")
+//    @Scheduled(cron = "0 * * * * *")
     public void checkStock() {
         count += 1;
 //      查询未出库状态,出库单存在的数据

src/main/resource/mapper/ware/StoreMapper.xml

@@ -444,7 +444,7 @@ update t_ware_store t set t.layer =   #{param7,jdbcType=INTEGER}
     and  t.model like concat('%',#{param3,jdbcType=VARCHAR},'%')
     and  c.name like concat('%',#{param4,jdbcType=VARCHAR},'%')
     and  c.standard like concat('%',#{param5,jdbcType=VARCHAR},'%')
-    and  d.name like concat('%',#{param6,jdbcType=VARCHAR},'%')
+    and  e.name like concat('%',#{param6,jdbcType=VARCHAR},'%')
     and  t.remark1 like concat('%',#{param13,jdbcType=VARCHAR},'%')
     and  (t.plate_no like concat('%',#{param7,jdbcType=VARCHAR},'%')
         <if test="param9 != null and param9.size() !=0" >
@@ -502,6 +502,7 @@ update t_ware_store t set t.layer =   #{param7,jdbcType=INTEGER}
 
 
 
+
   <select id="selectForCustomer" resultMap="BaseResultMap" >
     select e.name as fk_compony_id,t.*
     from t_ware_store t left join t_maint_customer e
@@ -599,4 +600,7 @@ update t_ware_store t set t.layer =   #{param7,jdbcType=INTEGER}
             #{item,jdbcType=VARCHAR}
         </foreach>
     </update>
+    <select id="queryStoreById" resultType="java.lang.String" parameterType="java.lang.String">
+        select plate_no from t_ware_store where stack_id = #{stackId,jdbcType=VARCHAR} and out_flag = '0' and cancel_flag = '0'
+    </select>
 </mapper>