代码更新

wms/hd/nladmin-system/src/main/java/org/nl/wms/st/basedata/service/impl/KilnServiceImpl.java

@@ -11,6 +11,7 @@ import org.nl.wql.core.bean.WQLObject;
 import org.nl.wql.util.WqlUtil;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Map;
 
@@ -37,6 +38,7 @@ public class KilnServiceImpl implements KilnService {
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void update(JSONObject jsonObject) {
         // 基础信息
         Long currentUserId = SecurityUtils.getCurrentUserId();
@@ -70,6 +72,9 @@ public class KilnServiceImpl implements KilnService {
         if (point_status.equals("00")) { // 空位
             // 删除仓位库存
             structIvtTab.delete("struct_id = '" + jsonObject.getString("struct_id") + "'");
+            if (ObjectUtil.isNotEmpty(vehicleGroupObj)) // 组盘不为空则删除组盘信息以及设置载具编码为空
+                vehicleGroupTab.delete(vehicleGroupObj);
+            vehicle_code = null;
         } else if (point_status.equals("01")) { // 空载具
             // 删除组盘
             if (ObjectUtil.isNotEmpty(vehicleGroupObj))
@@ -142,7 +147,7 @@ public class KilnServiceImpl implements KilnService {
         JSONObject point = pointTab.query("point_id = '" + jsonObject.getString("point_id") + "'").uniqueResult(0);
         point.put("point_status", point_status);
         point.put("lock_type", jsonObject.getString("lock_type"));
-        point.put("vehicle_code", jsonObject.getString("vehicle_code"));
+        point.put("vehicle_code", vehicle_code);
         pointTab.update(point);
     }
 }