托书调整

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

@@ -110,7 +110,7 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 	@ApiOperation(value="发运明细主表-分页列表查询", notes="发运明细主表-分页列表查询")
 	@GetMapping(value = "/list")
 	public Result<IPage<SyShippingDetailsVo>> queryPageList(SyShippingDetailsVo syShippingDetails,String startTime,String endTime,String flourOrGarment,
-								   String refer,String preDeliveryDateB,String preDeliveryDateE,
+								   String refer,String preDeliveryDateB,String preDeliveryDateE,String supplier,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
@@ -120,10 +120,10 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 		QueryWrapper<SyShippingDetailsVo> queryWrapper = new QueryWrapper<>();
 		SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd");
 		if(oConvertUtils.isNotEmpty(syShippingDetails.getDocumentNo())){
-			queryWrapper.eq("t.documentNo",syShippingDetails.getDocumentNo());
+			queryWrapper.like("t.documentNo",syShippingDetails.getDocumentNo());
 		}
 		if(oConvertUtils.isNotEmpty(syShippingDetails.getOrderNumber())){
-			queryWrapper.eq("t.orderNumber",syShippingDetails.getOrderNumber());
+			queryWrapper.like("t.orderNumber",syShippingDetails.getOrderNumber());
 		}
 		if(oConvertUtils.isNotEmpty(startTime)){
 		    queryWrapper.ge("t.documentDate",startTime);
@@ -137,14 +137,17 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 			queryWrapper.eq("t.preDeliveryDate",syShippingDetails.getPreDeliveryDate());
 		}
 		if(oConvertUtils.isNotEmpty(syShippingDetails.getSalesman())){
-			queryWrapper.eq("t.salesman",syShippingDetails.getSalesman());
+			queryWrapper.like("t.salesman",syShippingDetails.getSalesman());
 		}
 		if(oConvertUtils.isNotEmpty(syShippingDetails.getItemNumber())){
-			queryWrapper.eq("t.itemNumber",syShippingDetails.getItemNumber());
+			queryWrapper.like("t.itemNumber",syShippingDetails.getItemNumber());
 		}
 		if(oConvertUtils.isNotEmpty(refer)){
 			queryWrapper.eq("t.isReference",refer);
 		}
+		if(oConvertUtils.isNotEmpty(supplier)){
+			queryWrapper.like("t.supplier",supplier);
+		}
 		Page<SyShippingDetailsVo> page = new Page<SyShippingDetailsVo>(pageNo, pageSize);
 		if(flourOrGarment.equals("0")){//面辅料
 			 IPage<SyShippingDetailsVo> pageList = syShippingDetailsService.queryShippingDetailsGarment(page, queryWrapper);
@@ -843,7 +846,7 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 	  */
 	 @ApiOperation(value="订单数据明细展示", notes="订单数据明细展示")
 	 @PostMapping(value = "/displayDetails")
-	 public Result<List<OrderDataVo>> displayDetails(@RequestBody List<String> itemId){
+	 public Result<List<OrderDataVo>> displayDetails(@RequestBody List<String> itemId,String tOrf){
 
 	 	Result<List<OrderDataVo>> result = new Result<>();
 	 	int m = 0;
@@ -873,6 +876,11 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 				 if(ids.contains(li.getSyOrderDataItemId())){
 					 li.setGroupId(groupIdList.get(m));
 				 }
+				 if(tOrf.equals("成衣")){
+					 li.setMaterialComposition(li.getSpecificationAndModel());//取规格型号
+				 }else{
+					 li.setMaterialComposition(li.getInventoryName());//取存货名称
+				 }
 				 //查询最底层订单供应商
 				SyOrderDataVO entity = syGetOrderService.queryOrder(li.getSyOrderDataItemId());
 				 if(oConvertUtils.isNotEmpty(entity)){

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

@@ -241,4 +241,9 @@ public class OrderDataVo {
     @Excel(name = "门幅", width = 15)
     @ApiModelProperty(value = "门幅")
     private String guangpeiGateWidth;
+
+    /**物料成分*/
+    @Excel(name = "物料成分", width = 15)
+    @ApiModelProperty(value = "物料成分")
+    private java.lang.String materialComposition;
 }

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

@@ -276,4 +276,7 @@ public class SyShippingDetailsVo {
     private String elementsId;
     //分组id
     private String groupId;
+
+    //供应商
+    private String supplier;
 }

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

@@ -62,7 +62,7 @@
     b.deposit as deposit,b.collaborative_route as collaborativeRoute,b.term_of_payment as termOfPayment,b.end_customer as endCustomer,
     b.order_remarks as orderRemarks,b.price_remarks as priceRemarks,b.order_change_description as orderChangeDescription,b.pre_completion_date as preCompletionDate,
     b.sales_type_text as salesTypeText,b.customer_name as customerName,b.exchange_rate as exchangeRate,a.whole_order_total as wholeOrderTotal,
-    b.declaration_elements as declarationElements,b.number_of_sets as numberOfSets,a.chinese_name as chineseName,a.account as account,
+    b.declaration_elements as declarationElements,b.number_of_sets as numberOfSets,a.chinese_name as chineseName,a.account as account,b.supplier as supplier,
     a.english_product_name as englishProductName,b.garment_factory as garmentFactory,b.elements_id as elementsId from sy_shipping_details a
 left join sy_shipping_details_item b
 on a.id = b.shipping_details_id and b.del_flag = 0
@@ -87,7 +87,7 @@ ${ew.customSqlSegment}
     b.deposit as deposit,b.collaborative_route as collaborativeRoute,b.term_of_payment as termOfPayment,b.end_customer as endCustomer,
     b.order_remarks as orderRemarks,b.price_remarks as priceRemarks,b.order_change_description as orderChangeDescription,b.pre_completion_date as preCompletionDate,
     b.sales_type_text as salesTypeText,b.customer_name as customerName,b.exchange_rate as exchangeRate,a.whole_order_total as wholeOrderTotal,
-    b.declaration_elements as declarationElements,b.number_of_sets as numberOfSets,a.chinese_name as chineseName,a.account as account,
+    b.declaration_elements as declarationElements,b.number_of_sets as numberOfSets,a.chinese_name as chineseName,a.account as account,b.supplier as supplier,
     a.english_product_name as englishProductName,b.garment_factory as garmentFactory,b.elements_id as elementsId from sy_shipping_details a
 left join sy_shipping_details_item b
 on a.id = b.shipping_details_id and b.del_flag = 0
@@ -138,7 +138,7 @@ ${ew.customSqlSegment}
          b.colour as colour,b.size as size,b.coding_rules as codingRules,b.quantity as quantity,a.business_type_value as businessTypeText,a.customer_order_number as customerOrderNumber,
            a.sales_type_text as salesTypeText,a.customer_abbreviation as customerAbbreviation,a.customer_name as customerName,b.surplus_num as surplusNum,DATE_FORMAT(b.pre_completion_date,'%Y-%m-%d') as preCompletionDate,
            a.brand_side as brandSide,a.exchange_rate as exchangeRate,b.specification_and_model as specificationAndModel,a.account as account,b.inventory_code as inventoryCode,
-           b.distribution_point as distributionPoint,b.pack_id as packId,b.unit_price_including_tax as unitPriceIncludingTax,
+           b.distribution_point as distributionPoint,b.pack_id as packId,b.unit_price_including_tax as unitPriceIncludingTax,b.number_of_sets as numberOfSets,
            b.supplier_code as supplierCode,a.garment_nmb as garmentNmb,a.garment_factory as garmentFactory,DATE_FORMAT(b.pre_delivery_date,'%Y-%m-%d') as preDeliveryDate,b.box_number as boxNumber,
            a.whole_order_total as wholeOrderTotal,a.sales_department as salesDepartment,a.salesman as salesman,a.currency_text as currencyText,a.third_party as thirdParty,
             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,

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

@@ -154,4 +154,8 @@ public class SyShippingOrderItem {
 	@Excel(name = "（装箱单）成衣或者面料子表ID", width = 15)
 	@ApiModelProperty(value = "（装箱单）成衣或者面料子表ID")
 	private String tailoringFabricItemId;
+
+	/**申报要素ID*/
+	@ApiModelProperty(value = "申报要素ID")
+	private String elementsId;
 }

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

@@ -19,7 +19,7 @@
 <!--    查询装箱单-成衣-->
   <select id="queryTailoring" 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.depositary_receipt_no as depositaryReceiptNo,
+    select a.id as id ,GROUP_CONCAT(b.id) as itemId, a.document_No as documentNo,a.depositary_receipt_no as depositaryReceiptNo,b.elements_id as elementsId,
      a.item_number as itemNumber,b.inventory_name as inventoryName,b.distribution_point as distributionPoint,a.customer_abbreviation as customerAbbreviation,
      b.item_code as itemCode,b.starting_box_number as startingBoxNumber,b.end_case_number as endCaseNumber,b.hod as preDeliveryDate,b.small_Po as smallPo,
      b.colour as colour,b.pieces_box as piecesBox,b.box_number as boxNumber,b.total as total,b.outer_box_length as outerBoxLength,a.customer as customer,a.order_number as orderNumber,
@@ -42,7 +42,7 @@
     a.depositary_receipt_no as depositaryReceiptNo,b.order_Type as orderType,sum(b.gross_weight) as totalGrossWeight,sum(b.total_Price) as totalPrice,
      b.inventory_name as inventoryName,sum(b.inventory_quantity) as planQuantity,sum(b.net_weight) as totalNetWeight,a.container_Code as containerCode,
      b.inventory_Code as itemCode,a.memo as memo,a.container_number as containerNumber,
-     b.colour as colour,
+     b.colour as colour,b.elements_id as elementsId,
      '面料' as readyFabric
        from sy_packing_list_fabric a
     left join sy_packing_list_fabric_item b

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

@@ -157,6 +157,7 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
                         syShippingOrderItem.setOperatingDepartment(itemli.getSalesDepartment());
                         syShippingOrderItem.setPurchaseOutsourcingOrderNo(itemli.getPurOrSubOrder());
                         syShippingOrderItem.setPkOrg(itemli.getPkOrg());
+                        syShippingOrderItem.setElementsId(itemli.getElementsId());
 
                          itemList.add(syShippingOrderItem);
 
@@ -205,6 +206,7 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
                         syShippingOrderItem.setContainerNumber(li.getContainerNumber());//集装箱号
                         syShippingOrderItem.setTailoringFabricId(li.getTailoringFabricId());//成衣或者面料主表ID
                         syShippingOrderItem.setTailoringFabricItemId(li.getTailoringFabricItemId());//成衣或者面料子表ID
+                       // syShippingOrderItem.setElementsId()
 
                         itemList.add(syShippingOrderItem);