预托书问题调整

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

@@ -461,8 +461,8 @@ public class SyLetterDepositController extends JeecgController<SyLetterDeposit,
 			 queryWrapper.eq("a.customer_abbreviation",syPreAssembledPackingListVo.getCustomerAbbreviation());
 		 }
 		 //预发货日期
-		 if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getPreDeliveryDate())){
-			 queryWrapper.eq("b.hod",syPreAssembledPackingListVo.getPreDeliveryDate());
+		 if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getBeginTime())){
+			 queryWrapper.between("b.hod",syPreAssembledPackingListVo.getBeginTime(),syPreAssembledPackingListVo.getEndTime());
 		 }
 		 //小PO
 		 if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getSmallPo())){

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

@@ -170,4 +170,8 @@ public class SyPreAssembledPackingListVo {
     private String orderNumber;
     @ApiModelProperty(value = "采购/委外工厂（供应商）")
     private String supplier;
+
+    //预发货日期起始时间
+    private String beginTime;
+    private String endTime;
 }

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

@@ -1126,7 +1126,8 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 					 //集合转map
 					 for (SyShippingOrderItem li : list) {
 					 	BigDecimal cc = li.getNetWeight().multiply(li.getUnitPrice());
-					 	li.setTotalPrice(cc.setScale(2,BigDecimal.ROUND_HALF_UP));//重新计算金额 =  净重*单价
+					 	//2023.1.12注释
+					 	//li.setTotalPrice(cc.setScale(2,BigDecimal.ROUND_HALF_UP));//重新计算金额 =  净重*单价
 						 size++;
 						 Field[] fieldsList = li.getClass().getDeclaredFields();
 						 Map<String, Object> mapList = new HashMap<String, Object>();