BUG调整

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/seclarationElements/mapper/xml/SyDeclarationElementsMapper.xml

@@ -12,8 +12,8 @@
     </select>
 
     <update id="updateAssembledPacking">
-        update sy_pre_assembled_packing_list a
-        left join sy_pre_assembled_packing b
+        update sy_pre_assembled_packing_list_item a
+        left join sy_pre_assembled_packing_list b
         on a.sy_pre_assembled_packing_list_id = b.id
         set a.elements_id = #{newElmentId}
         where a.elements_id = #{elmentId} and a.del_flag = '0' and b.push_status ='0'

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/syShippingOrder/controller/SyShippingOrderController.java

@@ -582,6 +582,8 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 		 BigDecimal tatolMoney = BigDecimal.ZERO;
 		 //总体积
 		 BigDecimal tatolVolume = BigDecimal.ZERO;
+		 //总箱数
+		 BigDecimal tatolBoxnumber = BigDecimal.ZERO;
 
 		 Map<String, Object> map = new HashMap<String, Object>();
 
@@ -622,6 +624,7 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 					 tatolNumber  = tatolNumber.add(li.getNumber());
 					 tatolMoney = tatolMoney.add(li.getTotalPrice());
 					 tatolVolume = tatolVolume.add(li.getVolume());
+					 tatolBoxnumber = tatolBoxnumber.add(li.getBoxNumber());
 					 li.setDestination(entity.getArriveInCountry());
 				 }
 				 //总数量
@@ -637,20 +640,23 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 					 tatolNumber  = tatolNumber.add(li.getNumber());
 					 tatolMoney = tatolMoney.add(li.getTotalPrice());
 					 tatolVolume = tatolVolume.add(li.getVolume());
+					 tatolBoxnumber = tatolBoxnumber.add(li.getBoxNumber());
 					 li.setDestination(entity.getArriveInCountry());
 				 }
-				 //总毛重
-				 entity.setTotalGrossWeight(entity.getTotalGrossWeight());
-				 //总净重
-				 entity.setTotalNetWeight(entity.getTotalNetWeight());
-				 //总数量
-				 entity.setTatolNumber(tatolNumber);
-				 //总金额
-				 entity.setTatolMoney(tatolMoney);
-			     //总体积
-			     //entity.setTotalVolume(entity.get());
-			 }
 
+			 }
+			 //总毛重
+			 entity.setTotalGrossWeight(totalGrossWeight);
+			 //总净重
+			 entity.setTotalNetWeight(totalNetweight);
+			 //总数量
+			 entity.setTatolNumber(tatolNumber);
+			 //总金额
+			 entity.setTatolMoney(tatolMoney);
+			 //总体积
+			 entity.setTotalVolume(tatolVolume);
+			 //总箱数
+			 entity.setBoxNumber(tatolBoxnumber);
 			 //判空
 			 if(oConvertUtils.isEmpty(entity.getUnitInOperation())){
 				 entity.setUnitInOperation(" ");

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/syShippingOrder/service/impl/SyShippingOrderServiceImpl.java

@@ -232,11 +232,11 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
                             throw new JeecgBootException("没有查询到装箱单面料数据！");
                         }
                         //回写预装箱面料外销发票号、是否被参照、托书号,集装箱号，集装箱代号
-                        syPackingListFabric.setExportInvoiceNo(syShippingOrder.getShippingOrderNumber());
+                        //syPackingListFabric.setExportInvoiceNo(syShippingOrder.getShippingOrderNumber());
                         syPackingListFabric.setIsReference(1);
                         syPackingListFabric.setShippingOrderNumber(syShippingOrder.getShippingOrderNumber());
                         //syPackingListFabric.setContainerCode(li.getContainerCode());
-                        syPackingListFabric.setContainerNumber(li.getContainerNumber());
+                        //syPackingListFabric.setContainerNumber(li.getContainerNumber());
 
                         syPackingListFabricService.updateById(syPackingListFabric);
                     }
@@ -386,9 +386,9 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
                 //回写预装箱-面料是否被参照，托书号
                 syPackingListFabric.setIsReference(0);
                 syPackingListFabric.setShippingOrderNumber("");
-                syPackingListFabric.setExportInvoiceNo("");
+                //syPackingListFabric.setExportInvoiceNo("");
                 //syPackingListFabric.setContainerCode("");
-                syPackingListFabric.setContainerNumber("");
+               // syPackingListFabric.setContainerNumber("");
                 syPackingListFabricService.updateById(syPackingListFabric);
 
             }else{//成衣
@@ -489,9 +489,9 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
                 }
                 syPackingListTailoring.setIsReference(0);
                 syPackingListTailoring.setShippingOrderNumber("");
-                //syPackingListTailoring.setExportInvoiceNo("");
+                syPackingListTailoring.setExportInvoiceNo("");
                 //syPackingListTailoring.setContainerCode("");
-                //syPackingListTailoring.setContainerNumber("");
+                syPackingListTailoring.setContainerNumber("");
                 syPackingListTailoringService.updateById(syPackingListTailoring);
             }
         }