瀏覽代碼

小po查询优化

huxy 1 年之前
父節點
當前提交
e990271929

+ 7 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/service/impl/SyPreAssembledPackingListServiceImpl.java

@@ -150,6 +150,13 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 			System.out.println("item2.getgroupid\t"+item2.getGroupId());
 			 if(maps.containsKey(item2.getGroupId())){//有这个分组id
 				 SyPreAssembledPackingListItem item=item2;
+				 SyPreAssembledPackingListItem item4=maps.get(item.getGroupId());
+				 System.out.println("item4.getUnitPrice()\t"+item4.getUnitPrice());
+				 System.out.println("item.getUnitPrice()\t"+item.getUnitPrice());
+				 System.out.println("item4.getUnitPrice().equals(item.getUnitPrice())\t"+(item4.getUnitPrice().equals(item.getUnitPrice())));
+				 if (item4.getUnitPrice().equals(item.getUnitPrice())){
+					 item.setCustomsDeclarationUnitPrice(item.getUnitPrice());
+				 }
 				 List<SizeTable> sizes=item.getSizeTables();//获取尺码表信息
 				 BigDecimal boxNumber1=item.getBoxNumber();//获取箱数
 				 item.setActualPackingQty(item.getTotal());//计划装箱数量

+ 6 - 6
jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/controller/SyPackingListTailoringController.java

@@ -144,7 +144,7 @@ public class SyPackingListTailoringController implements Job {
 			queryWrapper.like("b.distribution_point",syPackingListTailoringVo.getDistributionPoint());//分销点
 		}
 		if(oConvertUtils.isNotEmpty(syPackingListTailoringVo.getSmallPo())){
-			queryWrapper.like("b.small_po",syPackingListTailoringVo.getSmallPo());//小po
+			queryWrapper.eq("b.small_po",syPackingListTailoringVo.getSmallPo());//小po
 		}
 		if(oConvertUtils.isNotEmpty(syPackingListTailoringVo.getDepositaryReceiptNo())){
 			queryWrapper.like("a.depositary_Receipt_No",syPackingListTailoringVo.getDepositaryReceiptNo());//预托书号
@@ -153,7 +153,7 @@ public class SyPackingListTailoringController implements Job {
 			queryWrapper.like("a.shipping_Order_Number",syPackingListTailoringVo.getShippingOrderNumber());//托书号
 		}
 		if(oConvertUtils.isNotEmpty(syPackingListTailoringVo.getStatus())){
-			queryWrapper.like("a.status",syPackingListTailoringVo.getStatus());//款号
+			queryWrapper.like("a.status",syPackingListTailoringVo.getStatus());//状态
 		}
 		if(oConvertUtils.isNotEmpty(stratDate)){
 			queryWrapper.ge("b.hod",stratDate);//起始日期
@@ -266,7 +266,7 @@ public class SyPackingListTailoringController implements Job {
 			 queryWrapper.eq("b.hod",syPreAssembledPackingListVo.getPreDeliveryDate());//预发货日期
 		 }*/
 		 if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getSmallPo())){
-			 queryWrapper.likeRight("b.small_po",syPreAssembledPackingListVo.getSmallPo());//小po
+			 queryWrapper.eq("b.small_po",syPreAssembledPackingListVo.getSmallPo());//小po
 		 }
 		 if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getOrderNumber())){
 			 queryWrapper.like("a.order_number",syPreAssembledPackingListVo.getOrderNumber());//订单号
@@ -583,7 +583,7 @@ public class SyPackingListTailoringController implements Job {
 				 queryWrapper.like("b.distribution_point",syPackingListTailoringVo.getDistributionPoint());//分销点
 			 }
 			 if(oConvertUtils.isNotEmpty(syPackingListTailoringVo.getSmallPo())){
-				 queryWrapper.like("b.small_po",syPackingListTailoringVo.getSmallPo());//小po
+				 queryWrapper.eq("b.small_po",syPackingListTailoringVo.getSmallPo());//小po
 			 }
 			 if(oConvertUtils.isNotEmpty(syPackingListTailoringVo.getDepositaryReceiptNo())){
 				 queryWrapper.like("a.depositary_Receipt_No",syPackingListTailoringVo.getDepositaryReceiptNo());//预托书号
@@ -794,7 +794,7 @@ public class SyPackingListTailoringController implements Job {
 			 queryWrapper.like("a.shipping_Order_Number",syPackingListTailoringVo.getShippingOrderNumber());//托书号
 		 }
 		 if(oConvertUtils.isNotEmpty(syPackingListTailoringVo.getSmallPo())){
-			 queryWrapper.like("b.small_po",syPackingListTailoringVo.getSmallPo());//小po
+			 queryWrapper.eq("b.small_po",syPackingListTailoringVo.getSmallPo());//小po
 		 }
 		 if(oConvertUtils.isNotEmpty(syPackingListTailoringVo.getDepositaryReceiptNo())){
 			 queryWrapper.like("a.depositary_Receipt_No",syPackingListTailoringVo.getDepositaryReceiptNo());//预托书号
@@ -1911,7 +1911,7 @@ public class SyPackingListTailoringController implements Job {
 	 @ApiOperation(value="调试接口-采购发票", notes="调试接口-采购发票")
 	 @RequestMapping(value = "/pushJson", method = {RequestMethod.POST})
 	 public Result json(@RequestBody JSONArray jsonArray){
-		 JSONArray jsonArray2= InterfaceConnUtils.doPost(jsonArray,"purinvoice_import");
+		 JSONArray jsonArray2= InterfaceConnUtils.doPost(jsonArray,"purinvovoice_import");
 		 Result result=new Result();
 		 result.setResult(jsonArray2);
 		 return  result;