托书调整

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

@@ -234,4 +234,6 @@ public class SyLetterDepositItem {
 	@Excel(name = "采购/委外订单号", width = 20)
 	@ApiModelProperty(value = "采购/委外订单号")
 	private String spurOrSubOrder;
+	@ApiModelProperty(value = "采购/委外工厂（供应商）")
+	private String supplier;
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/letterDeposit/mapper/xml/SyLetterDepositMapper.xml

@@ -96,7 +96,7 @@ on a.id = b.sy_letter_deposit_id
         select item_number as itemNumber,small_po as smallPo,total,box_number as boxNumber,pre_ids as preIds,sy_pre_assembled_packing_list_id as syPreAssembledPackingListId,
 total_gross_weight as totalGrossWeight,total_net_weight as totalNetWeight,total_volume as totalVolume,distribution_point as distributionPoint,
 container_code as containerCode,container_number as containerNumber,unit_price as unitPrice,total_price as totalPrice,
-hod,salesman,sales_Department as salesDepartment,spur_or_sub_order as spurOrSubOrder
+hod,salesman,sales_Department as salesDepartment,spur_or_sub_order as spurOrSubOrder,supplier
          from sy_letter_deposit_item
          where del_flag = 0 and sy_letter_deposit_id = #{syId} group by letter_groupid
 

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

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

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/shippingDetails/mapper/xml/SyShippingDetailsMapper.xml

@@ -144,7 +144,7 @@ ${ew.customSqlSegment}
             a.deposit_ratio as depositRatio,a.deposit as deposit,a.collaborative_route as collaborativeRoute,a.term_of_payment as termOfPayment,a.end_customer as endCustomer,
              a.order_remarks as orderRemarks,a.price_remarks as priceRemarks,a.order_change_description as orderChangeDescription,b.supplier as supplier,b.i_tax_price as iTaxPrice,
              case when b.ymoney is null then '0' else b.ymoney end as ymoney,b.ompo_id as ompoId,b.inventory_ccode as inventoryCcode,
-             b.ompo_id_item as ompoIdItem,b.ompo_account as ompoAccount,b.ompo_code as purOrSubOrder,
+             b.ompo_id_item as ompoIdItem,b.ompo_account as ompoAccount,b.ompo_code as purOrSubOrder
              from sy_order_data a
               left join sy_order_data_item b
         on a.id = b.sy_order_data_id and b.del_flag = 0

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

@@ -111,7 +111,7 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 			}
 
 		}
-
+		queryWrapper.eq("a.del_flag","0").eq("a.del_flag","0");
 		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

@@ -163,4 +163,9 @@ public class SyShippingOrderItem {
 	@Excel(name = "订单号", width = 15)
 	@ApiModelProperty(value = "订单号")
 	private java.lang.String orderNumber;
+
+	/**客户简称*/
+	@Excel(name = "客户简称", width = 15)
+	@ApiModelProperty(value = "客户简称")
+	private java.lang.String clientAbbreviation;
 }

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

@@ -13,7 +13,6 @@
   from sy_shipping_order a
   left join sy_shipping_order_item b
 	on a.id = b.sy_shipping_order_item_id
-  where a.del_flag = 0 and b.del_flag = 0
  ${ew.customSqlSegment}
     </select>
 
@@ -25,7 +24,7 @@ a.item_number as itemNumber,a.customer_abbreviation as customerAbbreviation,b.ho
 b.small_po as smallPo,b.distribution_point as distributionPoint,b.spur_Or_Sub_Order as purOrSubOrder,
 b.plan_Quantity as number,b.box_number as planQuantity,sum(b.gross_weight) as grossWeight,sum(b.net_weight) as netWeight,
 b.total_volume as totalVolume,a.container_code as containerCode,a.container_number as containerNumber,
-a.depositary_receipt_no as depositaryReceiptNo,a.garment_factory as garmentFactory,b.unit_price as price,
+a.depositary_receipt_no as depositaryReceiptNo,b.garment_factory as garmentFactory,b.unit_price as price,
 b.total_price as totalPrice,a.create_by as createBy,b.salesman as salesman,b.sales_Department as salesDepartment,
 c.english_product_name as englishProductName,'成衣' as readyFabric
    from sy_packing_list_tailoring a
@@ -42,7 +41,7 @@ c.english_product_name as englishProductName,'成衣' as readyFabric
 
   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_printing_plant as supplierPrintingPlant,a.plumbum_No as plumbumNo,
+  b.supplier_printing_plant as supplierPrintingPlant,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,

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

@@ -172,7 +172,7 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
                         syShippingOrderItem.setPkOrg(itemli.getPkOrg());
                         syShippingOrderItem.setElementsId(itemli.getElementsId());
                         syShippingOrderItem.setOrderNumber(itemli.getOrderNumber());
-
+                        syShippingOrderItem.setClientAbbreviation(li.getClientAbbreviation());//客户简称
 
                          itemList.add(syShippingOrderItem);
                     }