托书调整

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/syShippingOrder/entity/VO/SyPackingList.java

@@ -65,4 +65,7 @@ public class SyPackingList {
     @Excel(name = "成衣或者面料", width = 15)
     @ApiModelProperty(value = "成衣或者面料")
     private String readyFabric;
+
+    //入库数量
+    private BigDecimal inventoryQuantity;
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/syShippingOrder/mapper/xml/SyShippingOrderMapper.xml

@@ -36,7 +36,7 @@
     <select id="queryFabric" resultType="org.jeecg.modules.documents.syShippingOrder.entity.VO.SyPackingList">
 
     select a.id as id ,GROUP_CONCAT(b.id) as itemId, a.document_No as documentNo,a.order_number as orderNumber,a.depositary_receipt_no as depositaryReceiptNo,
-     b.inventory_name as productName,
+     b.inventory_name as productName,b.Remaining_Quantity as inventoryQuantity,
      b.inventory_Code as itemCode,
      b.colour as colour,
      '面料' as readyFabric

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

@@ -139,7 +139,9 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
                         syShippingOrderItem.setSyShippingOrderItemId(id);
                         syShippingOrderItem.setDelFlag("0");
                         syShippingOrderItem.setStyleNumber(itemli.getItemNumber());
-                        syShippingOrderItem.setNumber(itemli.getInventoryQuantity());//数量
+                        //查询主表获取剩余数量
+                        SyPackingListFabric entity = syPackingListFabricService.getById(li.getTailoringFabricId());
+                        syShippingOrderItem.setNumber(entity.getRemainingQuantity());//数量
 
                          itemList.add(syShippingOrderItem);
 
@@ -149,7 +151,7 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
                     //查询预装箱但面料数据
                     SyPackingListFabric syPackingListFabric = syPackingListFabricService.getById(li.getTailoringFabricId());
                     if(oConvertUtils.isEmpty(syPackingListFabric)){
-                        throw new JeecgBootException("没有查询到装箱单数据！");
+                        throw new JeecgBootException("没有查询到装箱单面料数据！");
                     }
                     ////回写预装箱面料外销发票号, 剩余数量
                     syPackingListFabric.setExportInvoiceNo(syShippingOrder.getExportInvoiceNo());