出运明细调整成衣工厂

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/shippingDetails/controller/SyShippingDetailsController.java

@@ -489,6 +489,9 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 	  	if(oConvertUtils.isNotEmpty(syShippingDetails.getSubmitStatus())){
 			queryWrapper.eq("t.submitStatus",syShippingDetails.getSubmitStatus());
 		}
+	  if(oConvertUtils.isNotEmpty(syShippingDetails.getId())){
+		  queryWrapper.like("t.id",syShippingDetails.getId());
+	  }
 
 	  try {
 		  Page<SyShippingDetailsVo> page = new Page<SyShippingDetailsVo>(1, -1);

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/shippingDetails/entity/SyShippingDetailsItem.java

@@ -406,8 +406,10 @@ public class SyShippingDetailsItem {
 		//客户简称字段用最终客户字段替代 只针对成衣
 		if(orderDataVo.getInventoryCcode().substring(0,2).equals("19")){
 			this.customerAbbreviation = orderDataVo.getEndCustomer();
+			this.garmentFactory = orderDataVo.getSupplier();
 		}else{
 			this.customerAbbreviation = orderDataVo.getCustomerAbbreviation();
+			this.garmentFactory = orderDataVo.getGarmentFactory();
 		}
 
         this.customerName = orderDataVo.getCustomerName();
@@ -437,7 +439,7 @@ public class SyShippingDetailsItem {
 		this.boxNumber = orderDataVo.getBoxNumber();
 		this.preDeliveryDate = orderDataVo.getPreDeliveryDate();
 		this.preCompletionDate = orderDataVo.getPreCompletionDate();
-		this.garmentFactory = orderDataVo.getGarmentFactory();
+		//this.garmentFactory =
 		this.specificationAndModel = orderDataVo.getSpecificationAndModel();
 		this.colour = orderDataVo.getColour();
 		this.size = orderDataVo.getSize();