装箱逻辑变更

src/main/java/com/xujie/sys/modules/ecss/controller/CoDelController.java

@@ -206,6 +206,13 @@ public class CoDelController {
         return R.ok().put("rows", rows);
     }
 
+    @PostMapping("/selectBoxList")
+    @ResponseBody
+    public R selectBoxList(@RequestBody EcssCoDelNotifyHeaderData inData){
+        List<Map> rows =coDelService.selectBoxList(inData);
+        return R.ok().put("rows", rows);
+    }
+
     @PostMapping("/searchCoDelPalletDataNew")
     @ResponseBody
     public R searchCoDelPalletDataNew(@RequestBody EcssCoDelNotifyHeaderData inData){
@@ -214,7 +221,7 @@ public class CoDelController {
     }
 
     @PostMapping("/saveCoDelPalletDataByExcel")
-    public R saveCoDelPalletDataByExcel(@RequestParam(value = "file") MultipartFile file, 
+    public R saveCoDelPalletDataByExcel(@RequestParam(value = "file") MultipartFile file,
                                        @RequestParam(value = "palletRecords", required = false) String palletRecords,
                                        @ModelAttribute EcssCoDelNotifyHeaderData data){
         coDelService.saveCoDelPalletDataByExcel(file, data, palletRecords);

src/main/java/com/xujie/sys/modules/ecss/data/EcssCoDelNotifyHeaderData.java

@@ -24,4 +24,5 @@ public class EcssCoDelNotifyHeaderData extends EcssCoDelNotifyHeader {
     private Boolean modifyFlag;
     private String modifyData;
     private String exportFlag;
+    private Integer seqNo;
 }

src/main/java/com/xujie/sys/modules/ecss/service/CoDelService.java

@@ -58,6 +58,8 @@ public interface CoDelService {
 
     List<EcssCoDelPalletData> searchCoDelPalletDataNew(EcssCoDelNotifyHeaderData inData);
 
+    List<Map> selectBoxList(EcssCoDelNotifyHeaderData inData);
+
     void saveCoDelPalletDataByExcel(MultipartFile file,  EcssCoDelNotifyHeaderData data, String palletRecords);
 
     List<EcssCoDelPalletHeaderData> searchEcssCoDelPalletHeaderData(EcssCoDelNotifyHeaderData inData);

src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelServiceImpl.java

@@ -793,6 +793,11 @@ public class CoDelServiceImpl implements CoDelService {
         return coDelMapper.searchCoDelPalletData(inData);
     }
 
+    @Override
+    public List<Map> selectBoxList(EcssCoDelNotifyHeaderData inData) {
+        return coDelMapper.selectBoxList(inData);
+    }
+
     @Override
     public List<EcssCoDelPalletData> searchCoDelPalletDataNew(EcssCoDelNotifyHeaderData inData) {
         return coDelMapper.searchCoDelPalletDataNew(inData);
@@ -1270,10 +1275,6 @@ public class CoDelServiceImpl implements CoDelService {
 
     @Override
     public void deletePalletHeader(EcssCoDelPalletHeaderData inData) {
-        List<EcssCoDelPalletDetailData> checkList = coDelMapper.searchEcssCoDelPalletDetailData(inData);
-        if (checkList.size() > 0) {
-            throw new RuntimeException("栈板下有箱子，无法删除！");
-        }
         coDelMapper.deletePalletHeader(inData);
     }
 

src/main/resources/mapper/ecss/CoDelMapper.xml

@@ -1058,6 +1058,9 @@ left join ecss_CoDelNotifyHeader noHeader on a.site=noHeader.site and a.delNo=no
         from ecss_CoDelPalletDetail b
         left join ecss_CoDelBoxList c on b.site=c.site and b.bu_no=c.bu_no and b.delNo=c.delNo and b.seq_no=c.item_no
         where b.site=#{site} and b.bu_no=#{buNo} and b.delNo=#{delNo}
+        <if test="seqNo != null and seqNo != ''">
+            and b.seq_no=#{seqNo}
+        </if>
     </select>
 
     <update id="updateExportFlag">
@@ -1071,7 +1074,7 @@ left join ecss_CoDelNotifyHeader noHeader on a.site=noHeader.site and a.delNo=no
     </update>
 
     <select id="selectBoxList" resultType="java.util.Map">
-        select * from ecss_CoDelBoxList
+        select *,CONVERT(DECIMAL(20, 3),gross_weight) as grossWeight,CONVERT(DECIMAL(20, 3),net_weight) as netWeight from ecss_CoDelBoxList
         where site = #{site} and bu_no = #{buNo} and delNo = #{delNo}
     </select>