预托书调整

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/letterDeposit/controller/SyLetterDepositController.java

@@ -82,9 +82,30 @@ public class SyLetterDepositController extends JeecgController<SyLetterDeposit,
 
 		Result<IPage<SyLetterDeposit>> result = new Result<IPage<SyLetterDeposit>>();
 		try {
-			QueryWrapper<SyLetterDeposit> queryWrapper = QueryGenerator.initQueryWrapper(syLetterDeposit, req.getParameterMap());
+			QueryWrapper<SyLetterDeposit> queryWrapper = new QueryWrapper<SyLetterDeposit>();
 			Page<SyLetterDeposit> page = new Page<SyLetterDeposit>(pageNo, pageSize);
-			queryWrapper.eq("a.del_flag",0).groupBy("a.id").orderByDesc("a.depositary_receipt_no");
+			//客户简称
+			if(oConvertUtils.isNotEmpty(syLetterDeposit.getClientAbbreviation().trim())){
+				queryWrapper.eq("b.client_abbreviation",syLetterDeposit.getClientAbbreviation());
+			}
+			//集装箱号
+			if(oConvertUtils.isNotEmpty(syLetterDeposit.getContainerNumber().trim())){
+				queryWrapper.eq("b.container_number",syLetterDeposit.getContainerNumber());
+			}
+			//小PO
+			if(oConvertUtils.isNotEmpty(syLetterDeposit.getSmallPo().trim())){
+				queryWrapper.eq("b.small_po",syLetterDeposit.getSmallPo());
+			}
+			//预托书号
+			if(oConvertUtils.isNotEmpty(syLetterDeposit.getDepositaryReceiptNo().trim())){
+				queryWrapper.eq("b.depositary_receipt_no",syLetterDeposit.getDepositaryReceiptNo());
+			}
+			//托书日期
+			if(oConvertUtils.isNotEmpty(syLetterDeposit.getShippingOrderDate())){
+				queryWrapper.eq("a.shipping_order_date",syLetterDeposit.getShippingOrderDate());
+			}
+
+			queryWrapper.eq("a.del_flag",0).groupBy("a.id").orderByDesc("a.create_time");
 			IPage<SyLetterDeposit> pageList = syLetterDepositService.querySyLetterDeposit(page, queryWrapper);
 			result.setSuccess(true);
 			result.setMessage("查询成功！");
@@ -334,9 +355,24 @@ public class SyLetterDepositController extends JeecgController<SyLetterDeposit,
 									HttpServletRequest req) {
 
 		 Result<IPage<SyPreAssembledPackingListVo>> result = new Result<IPage<SyPreAssembledPackingListVo>>();
-		// QueryWrapper<SyPreAssembledPackingListVo> queryWrapper = new QueryWrapper<SyPreAssembledPackingListVo>();
-		 QueryWrapper<SyPreAssembledPackingListVo> queryWrapper = QueryGenerator.initQueryWrapper(syPreAssembledPackingListVo, req.getParameterMap());
-
+		 QueryWrapper<SyPreAssembledPackingListVo> queryWrapper = new QueryWrapper<SyPreAssembledPackingListVo>();
+		 //客户简称
+		 if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getCustomerAbbreviation())){
+			 queryWrapper.eq("a.customer_abbreviation",syPreAssembledPackingListVo.getCustomerAbbreviation());
+		 }
+		 //预发货日期
+		 if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getPreDeliveryDate())){
+			 queryWrapper.eq("b.hod",syPreAssembledPackingListVo.getPreDeliveryDate());
+		 }
+		 //小PO
+		 if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getSmallPo())){
+			 queryWrapper.eq("b.small_po",syPreAssembledPackingListVo.getSmallPo());
+		 }
+         //分销点
+		 if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getDistributionPoint())){
+			 queryWrapper.eq("b.distribution_point",syPreAssembledPackingListVo.getDistributionPoint());
+		 }
+		 //款号
 		 if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getItemNumber())){
 			 queryWrapper.eq("a.item_number",syPreAssembledPackingListVo.getItemNumber());
 		 }

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

@@ -237,4 +237,12 @@ public class SyLetterDeposit {
 	@ApiModelProperty(value = "预装箱单子表ID")
 	@TableField(exist = false)
 	private String syPreAssembledPackingListId;
+
+	@ApiModelProperty(value = "集装箱号")
+	@TableField(exist = false)
+	private String containerNumber;
+
+	@ApiModelProperty(value = "小po")
+	@TableField(exist = false)
+	private java.lang.String smallPo;
 }

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

@@ -222,4 +222,16 @@ public class SyLetterDepositItem {
 	@Excel(name = "客户简称", width = 15)
 	@ApiModelProperty(value = "客户简称")
 	private java.lang.String clientAbbreviation;
+	/**业务员*/
+	//@Excel(name = "业务员", width = 15)
+	@ApiModelProperty(value = "业务员")
+	private java.lang.String salesman;
+	/**业务部门(销售部门)*/
+	//@Excel(name = "业务部门(销售部门)", width = 15)
+	@ApiModelProperty(value = "业务部门(销售部门)")
+	private java.lang.String salesDepartment;
+	/**采购/委外订单号*/
+	@Excel(name = "采购/委外订单号", width = 20)
+	@ApiModelProperty(value = "采购/委外订单号")
+	private String spurOrSubOrder;
 }

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

@@ -7,11 +7,12 @@
 
 select a.document_No as documentNo,a.id as id,GROUP_CONCAT(b.id) as itemId,a.item_number as itemNumber,b.hod as preDeliveryDate ,b.inventory_name as inventoryName,b.po_no as poNo,b.distribution_point as distributionPoint,
 a.memo,a.customer,b.colour,sum(b.box_number) as  boxNumber,b.ac_set_no as acSetNo,sum(b.total) as total,a.customer_abbreviation as customerAbbreviation,
-sum(b.total_net_weight) as totalNetWeight,a.order_type as orderType,b.plan_Quantity as totalQuantity,b.small_Po as smallPo,b.unit_price as unitPrice,
+sum(b.total_net_weight) as totalNetWeight,a.order_type as orderType,b.plan_Quantity as totalQuantity,b.small_po as smallPo,b.unit_price as unitPrice,
 sum(b.total_gross_weight) as totalGrossWeight,sum(b.total_volume) as totalVolume,sum(b.total_price) as totalPrice,b.factory_unit_price as factoryUnitPrice,
 a.depositary_receipt_no as depositaryReceiptNo,a.spur_Or_Sub_Order as spurOrSubOrder,sum(b.pieces_box) as piecesBox,b.size,a.order_number as orderNumber,
 b.starting_box_number as startingBoxNumber,b.end_case_number as endCaseNumber,b.outer_box_length as outerBoxLength,b.outer_box_width as outerBoxWidth,b.outer_box_height as outerBoxHeight,
-b.garment_factory as garmentFactory,b.hod as hod,b.style_no as styleNo,b.prepack_sku as prepackSku,a.salesman as salesman,a.sales_department
+b.garment_factory as garmentFactory,b.hod as hod,b.style_no as styleNo,b.prepack_sku as prepackSku,
+b.salesman as salesman,b.sales_Department as salesDepartment
 from sy_pre_assembled_packing_list_item b
 left join sy_pre_assembled_packing_list a
 on a.id = b.sy_pre_assembled_packing_list_id
@@ -95,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
+hod,salesman,sales_Department as salesDepartment,spur_or_subOrder as spurOrSubOrder
          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

@@ -174,6 +174,9 @@ public class SyLetterDepositServiceImpl extends ServiceImpl<SyLetterDepositMappe
                     itenPojo.setSmallPo(syper.getSmallPo());
                     itenPojo.setPreAssembledPackingNo(li.getPreAssembledPackingNo());
                     itenPojo.setClientAbbreviation(li.getClientAbbreviation());
+                    itenPojo.setSalesman(syper.getSalesman());
+                    itenPojo.setSpurOrSubOrder(syper.getSpurOrSubOrder());
+                    itenPojo.setSalesDepartment(syper.getSalesDepartment());//业务部门
 
                     syLetterDepositItemList.add(itenPojo);
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/orderData/entity/SyOrderData.java

@@ -189,6 +189,11 @@ public class SyOrderData {
 	@ApiModelProperty(value = "成衣加工商")
 	private java.lang.String garmentFactory;
 
+	/**成衣加工商*/
+	@Excel(name = "成衣加工商编码", width = 15)
+	@ApiModelProperty(value = "成衣加工商编码")
+	private java.lang.String garmentFactoryCode;
+
 	/**成衣件数*/
 	@Excel(name = "成衣件数", width = 15)
 	@ApiModelProperty(value = "成衣件数")

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

@@ -870,10 +870,12 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 					 li.setOmpoAccount(entity.getOmpoAccount());//供应商账套
 					 li.setPurOrSubOrder(entity.getOmpoCode());//委外采购订单号
 					 li.setYmoney(entity.getYmoney());//佣金
-//					 String mengfu = li.getGuangpeiGateWidth();
-//					 if(mengfu.substring(0,1).indexOf("/") != 1){
-//						 li.setGuangpeiGateWidth(entity.getGuangpeiGateWidth().toString());
-//					 }
+					 String mengfu = li.getGuangpeiGateWidth();
+					 if(oConvertUtils.isNotEmpty(mengfu)){
+						 if(mengfu.length()==1 && mengfu.indexOf("/") != -1){
+							 li.setGuangpeiGateWidth(entity.getGuangpeiGateWidth().toString());
+						 }
+					 }
 
 				 }
 			 }