一键装箱rolls

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

@@ -3829,6 +3829,7 @@ public class CoDelServiceImpl implements CoDelService {
                         boxListData.setNetWeight(boxNetWeight);
                         boxListData.setBoxQty(wholeBoxes);
                         boxListData.setCreateBy(currentUser.getUsername());
+                        boxListData.setRolls(wholeBoxQty.divide(BigDecimal.valueOf(propertiesRollQty.getNumValue()), 4, RoundingMode.HALF_UP));
                         coDelMapper.saveCodelBoxList(boxListData);
 
                         EcssCoDelPalletDetailData wholeBoxData = new EcssCoDelPalletDetailData();
@@ -3865,6 +3866,7 @@ public class CoDelServiceImpl implements CoDelService {
                         boxListData.setNetWeight(boxNetWeight);
                         boxListData.setBoxQty(BigDecimal.ONE);
                         boxListData.setCreateBy(currentUser.getUsername());
+                        boxListData.setRolls(remainderQty.divide(BigDecimal.valueOf(propertiesRollQty.getNumValue()), 4, RoundingMode.HALF_UP));
                         coDelMapper.saveCodelBoxList(boxListData);
 
                         EcssCoDelPalletDetailData remainderBoxData = new EcssCoDelPalletDetailData();
@@ -3902,6 +3904,7 @@ public class CoDelServiceImpl implements CoDelService {
                     boxListData.setNetWeight(boxNetWeight);
                     boxListData.setBoxQty(actualBoxQty);
                     boxListData.setCreateBy(currentUser.getUsername());
+                    boxListData.setRolls(detailData.getQty().divide(BigDecimal.valueOf(propertiesRollQty.getNumValue()), 4, RoundingMode.HALF_UP));
                     coDelMapper.saveCodelBoxList(boxListData);
 
                     EcssCoDelPalletDetailData palletDetailData = new EcssCoDelPalletDetailData();
@@ -6427,7 +6430,7 @@ public class CoDelServiceImpl implements CoDelService {
                     String lengthStr = getCellValueAsString(row.getCell(6), dataFormatter);
                     String widthStr = getCellValueAsString(row.getCell(7), dataFormatter);
                     String heightStr = getCellValueAsString(row.getCell(8), dataFormatter);
-                    
+
                     // 读取FSC标签属性字段：P距 排数 1米标签面积 底纸宽度(MM) BOM分配张数 P距-2 排数-2 1米标签面积-2 底纸宽度(MM)-2 BOM分配张数-2
                     String fsc001Str = getCellValueAsString(row.getCell(9), dataFormatter);   // P距
                     String fsc002Str = getCellValueAsString(row.getCell(10), dataFormatter);  // 排数
@@ -6453,7 +6456,7 @@ public class CoDelServiceImpl implements CoDelService {
                     rowData.put("length", lengthStr);
                     rowData.put("width", widthStr);
                     rowData.put("height", heightStr);
-                    
+
                     // FSC标签属性字段
                     rowData.put("fsc001", fsc001Str);
                     rowData.put("fsc002", fsc002Str);
@@ -6508,7 +6511,7 @@ public class CoDelServiceImpl implements CoDelService {
                     int updatedPartCount = 0;
 
                     // 处理属性值：每卷数量(ROLLQTY)、每箱卷数(BOXROLLS)、每卷重量(ROLLWEIGHT)、箱重量(BOXWEIGHT)、FSC标签属性
-                    String[] itemNos = {"ROLLQTY", "BOXROLLS", "ROLLWEIGHT", "BOXWEIGHT", 
+                    String[] itemNos = {"ROLLQTY", "BOXROLLS", "ROLLWEIGHT", "BOXWEIGHT",
                                        "FSC001", "FSC002", "FSC003", "FSC004", "FSC005",
                                        "FSC001-02", "FSC002-02", "FSC003-02", "FSC004-02", "FSC005-02"};
                     String[] itemValues = {rollQtyStr, boxRollsStr, rollWeightStr, boxWeightStr,