总体积除以1000000

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/entity/SyPreAssembledPackingList.java

@@ -132,8 +132,8 @@ public class SyPreAssembledPackingList implements Serializable {
 	@ApiModelProperty(value = "推送状态{未推送：0,推送成功:1,推送失败:2}")
 	private String pushStatus;
 	/**单据装填0未提交1已提交*/
-	//@ApiModelProperty(value = "单据装填0未提交1已提交")
-	@ApiModelProperty(value = "单据装填{未提交：0,已提交:1,取消提交:2}")
+	//@ApiModelProperty(value = "单据状态0未提交1已提交")
+	@ApiModelProperty(value = "单据状态{未提交：0,已提交:1,取消提交:2}")
 	private String status;
 	/**创建人*/
 	@ApiModelProperty(value = "创建人")

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

@@ -79,7 +79,7 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 				BigDecimal volume=boxNumber.multiply(item1.getOuterBoxHeight());
 				volume=volume.multiply(item1.getOuterBoxLength());
 				volume=volume.multiply(item1.getOuterBoxWidth());
-				item1.setTotalVolume(volume.multiply(new BigDecimal(1000000)));//获取总体积	长*宽*高*箱数
+				item1.setTotalVolume(volume.divide(new BigDecimal(1000000)));//获取总体积	长*宽*高*箱数
 
 				item1.setSyDeclarationElementsItemId(size.getItemId());//获取到发运明细子表id
 				item1.setSort(size.getNum());//获取序号
@@ -124,7 +124,7 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 				BigDecimal volume=boxNumber.multiply(item1.getOuterBoxHeight());//获取体积
 				volume=volume.multiply(item1.getOuterBoxLength());
 				volume=volume.multiply(item1.getOuterBoxWidth());
-				item1.setTotalVolume(volume.multiply(new BigDecimal(1000000)));//获取总体积	长*宽*高*箱数
+				item1.setTotalVolume(volume.divide(new BigDecimal(1000000)));//获取总体积	长*宽*高*箱数
 
 				//item.setSyDeclarationElementsItemId(size.getItemId());//获取到发运明细子表id
 				item1.setId(size.getItemId());//从尺码表中获取到id

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/controller/SyPackingListFabricController.java

@@ -87,8 +87,11 @@ public class SyPackingListFabricController {
 	 @GetMapping(value = "/getShippingDetails")
 	 public Result<IPage<SyShippingDetailsVo>> getShippingDetails(
 			 String documentNo,
-			 String chineseName,
-			 String orderNumber,
+			 String customer,
+			 String distributionPoint,
+			 String startDate,
+			 String smallPo,
+			 String endDate,
 			 @RequestParam(name="status", defaultValue="y") String status,
 			 @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 			 @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
@@ -99,12 +102,23 @@ public class SyPackingListFabricController {
 		 if(oConvertUtils.isNotEmpty(documentNo)) {
 			 queryWrapper.eq("t.documentNo", documentNo);//单据号
 		 }
-		 if(oConvertUtils.isNotEmpty(chineseName)){
-			 queryWrapper.eq("t.chineseName",chineseName);//品名
+		 if(oConvertUtils.isNotEmpty(customer)){//客户
+			 queryWrapper.eq("t.customer",customer).or().eq("t.customerAbbreviation",customer);
 		 }
-		 if(oConvertUtils.isNotEmpty(orderNumber)){
-			 queryWrapper.eq("t.orderNumber",orderNumber);//订单号
+		 if(oConvertUtils.isNotEmpty(distributionPoint)){//分销点
+			 queryWrapper.eq("t.distributionPoint",distributionPoint);
 		 }
+		 if(oConvertUtils.isNotEmpty(smallPo)){//小po
+			 queryWrapper.eq("t.smallPo",smallPo);
+		 }
+		 //预发货日期
+		 if(oConvertUtils.isNotEmpty(startDate)){//起始
+			 queryWrapper.ge("t.preDeliveryDate",startDate);
+		 }
+		 if(oConvertUtils.isNotEmpty(endDate)){//结束
+			 queryWrapper.le("t.preDeliveryDate",endDate);
+		 }
+
 /*		 if(oConvertUtils.isNotEmpty(status)){//选择正常或者超发状态
 			 if(status.equals("n")){
 				 queryWrapper.ge("t.excess_quantity",0);//大于等于--超发

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/service/impl/SyPackingListTailoringServiceImpl.java

@@ -65,7 +65,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 				BigDecimal volume=boxNumber.multiply(item1.getOuterBoxHeight());
 				volume=volume.multiply(item1.getOuterBoxLength());
 				volume=volume.multiply(item1.getOuterBoxWidth());
-				item1.setTotalVolume(volume.multiply(new BigDecimal(1000000)));//获取总体积	长*宽*高*箱数
+				item1.setTotalVolume(volume.divide(new BigDecimal(1000000)));//获取总体积	长*宽*高*箱数
 				item1.setSyPreAssembledPackingListItemId(size.getItemId());//获取到预装箱单子表id
 				item1.setSort(size.getNum());//获取序号
 				item1.setId(oConvertUtils.id());//获取到随机id
@@ -99,7 +99,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 				BigDecimal volume=boxNumber.multiply(item1.getOuterBoxHeight());//获取体积
 				volume=volume.multiply(item1.getOuterBoxLength());
 				volume=volume.multiply(item1.getOuterBoxWidth());
-				item1.setTotalVolume(volume.multiply(new BigDecimal(1000000)));//获取总体积	长*宽*高*箱数
+				item1.setTotalVolume(volume.divide(new BigDecimal(1000000)));//获取总体积	长*宽*高*箱数
 
 				//item.setSyDeclarationElementsItemId(size.getItemId());//获取到发运明细子表id
 				item1.setId(size.getItemId());//从尺码表中获取到id