托书调整

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/letterDeposit/entity/SyLetterDepositItem.java

@@ -236,4 +236,6 @@ public class SyLetterDepositItem {
 	private String spurOrSubOrder;
 	@ApiModelProperty(value = "采购/委外工厂（供应商）")
 	private String supplier;
+	@ApiModelProperty(value = "采购/委外工厂（供应商编码）")
+	private String supplierCode;
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/letterDeposit/service/impl/SyLetterDepositServiceImpl.java

@@ -178,6 +178,7 @@ public class SyLetterDepositServiceImpl extends ServiceImpl<SyLetterDepositMappe
                     itenPojo.setSpurOrSubOrder(syper.getSpurOrSubOrder());
                     itenPojo.setSalesDepartment(syper.getSalesDepartment());//业务部门
                     itenPojo.setSupplier(syper.getSupplier());//采购/委外工厂（最底层供应商）
+                    itenPojo.setSupplierCode(syper.getSupplierCode());//采购/委外工厂（最底层供应商编码）
 
                     syLetterDepositItemList.add(itenPojo);
 

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

@@ -113,6 +113,8 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 
 		}
 		queryWrapper.eq("a.del_flag","0").eq("a.del_flag","0");
+		queryWrapper.orderByDesc("a.create_time");
+		queryWrapper.groupBy("a.shipping_order_number");
 		Page<SyShippingOrder> page = new Page<SyShippingOrder>(pageNo, pageSize);
 		IPage<SyShippingOrder> pageList = syShippingOrderService.syShippingOrderPageList(page, queryWrapper);
 

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

@@ -179,4 +179,24 @@ public class SyShippingOrderItem {
 
 	//金额
 	private BigDecimal totalPrice;
+
+	@Excel(name = "染厂供应商编码", width = 15)
+	@ApiModelProperty(value = "染厂供应商编码")
+	private java.lang.String rSupplierCode;
+
+	@Excel(name = "染厂供应商", width = 15)
+	@ApiModelProperty(value = "染厂供应商")
+	private java.lang.String rSupplier;
+
+	@Excel(name = "最底层供应商编码", width = 15)
+	@ApiModelProperty(value = "最底层供应商编码")
+	private java.lang.String supplierCode;
+
+	@Excel(name = "最底层供应商名称", width = 15)
+	@ApiModelProperty(value = "最底层供应商名称")
+	private java.lang.String supplier;
+
+	@Excel(name = "成衣工厂", width = 15)
+	@ApiModelProperty(value = "成衣工厂")
+	private String garmentFactory;
 }

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

@@ -42,9 +42,10 @@ c.english_product_name as englishProductName,'成衣' as readyFabric,b.supplier
   select a.id as id ,GROUP_CONCAT(b.id) as itemId,a.document_No as documentNo,a.create_by as createBy,
   a.export_invoice_no as exportInvoiceNo,a.container_number as containerNumber,a.garment_Factory as garmentFactory,
   b.supplier as supplier,a.plumbum_No as plumbumNo,a.customer_abbreviation as customerAbbreviation,
-  case when b.u8_Pid is null then sum(b.inventory_quantity) else sum(b.gross_weight) end as Total,
-  b.item_Number as itemNumber,b.small_Po as smallPo,b.plan_Quantity as planQuantity,sum(b.gross_weight) as grossWeight,
-  sum(b.net_weight) as netWeight,sum(b.total_Volume) as totalVolume,b.distribution_Point as distributionPoint,
+  case when b.u8_Pid is null then sum(b.inventory_quantity) else sum(b.gross_weight) end as Total,b.inventory_quantity as number,
+   case when b.u8_Pid is null then '0' else sum(b.rolls) end as planQuantity,
+  b.item_Number as itemNumber,b.small_Po as smallPo,sum(b.gross_weight) as grossWeight,
+  sum(b.net_weight) as netWeight,'0' as totalVolume,b.distribution_Point as distributionPoint,
   a.container_Code as containerCode,b.price,b.total_Price as totalPrice,b.pre_Delivery_Date as preDeliveryDate,
   b.salesman as salesman,b.sales_Department as salesDepartment,b.pur_Or_Sub_Order as purOrSubOrder,
   c.english_product_name as englishProductName,b.order_Number as orderNumber,'面料' as readyFabric from sy_packing_list_fabric a

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

@@ -194,6 +194,11 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
                         syShippingOrderItem.setOrderNumber(itemli.getOrderNumber());
                         syShippingOrderItem.setClientAbbreviation(li.getClientAbbreviation());//客户简称
                         syShippingOrderItem.setTotalPrice(itemli.getTotalPrice());//金额
+                        syShippingOrderItem.setSupplier(itemli.getSupplier());
+                        syShippingOrderItem.setSupplierCode(itemli.getSupplierCode());
+                        syShippingOrderItem.setRSupplier(itemli.getSupplierDyeingPlant());//染厂供应商
+                        syShippingOrderItem.setRSupplierCode(itemli.getSupplierCodeDyeingPlant());//染厂供应商编码
+                        syShippingOrderItem.setGarmentFactory(li.getGarmentFactory());
 
                          itemList.add(syShippingOrderItem);
                     }
@@ -253,6 +258,10 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
                         syShippingOrderItem.setStyleNumber(li.getStyleNumber());//款号
                         syShippingOrderItem.setPurchaseOutsourcingOrderNo(lit.getSpurOrSubOrder());
                         syShippingOrderItem.setTotalPrice(lit.getTotalPrice());//金额
+                        syShippingOrderItem.setSupplier(null);
+                        syShippingOrderItem.setSupplierCode(null);
+                        syShippingOrderItem.setRSupplier(null);//染厂供应商
+                        syShippingOrderItem.setRSupplierCode(null);//染厂供应商编码
 
                         itemList.add(syShippingOrderItem);