添加成衣和面料参照查询条件

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

@@ -86,8 +86,9 @@ public class SyPackingListFabricController {
 	 @ApiOperation(value="参照发运明细", notes="参照发运明细")
 	 @GetMapping(value = "/getShippingDetails")
 	 public Result<IPage<SyShippingDetailsVo>> getShippingDetails(
-			 @RequestParam(name="documentNo",required = false) String documentNo,
-			 @RequestParam(name="chineseName",required = false) String chineseName,
+			 String documentNo,
+			 String chineseName,
+			 String orderNumber,
 			 @RequestParam(name="status", defaultValue="y") String status,
 			 @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 			 @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
@@ -101,6 +102,9 @@ public class SyPackingListFabricController {
 		 if(oConvertUtils.isNotEmpty(chineseName)){
 			 queryWrapper.eq("t.chineseName",chineseName);//品名
 		 }
+		 if(oConvertUtils.isNotEmpty(orderNumber)){
+			 queryWrapper.eq("t.orderNumber",orderNumber);//订单号
+		 }
 /*		 if(oConvertUtils.isNotEmpty(status)){//选择正常或者超发状态
 			 if(status.equals("n")){
 				 queryWrapper.ge("t.excess_quantity",0);//大于等于--超发

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/service/impl/SyPackingListFabricServiceImpl.java

@@ -2,7 +2,10 @@ package org.jeecg.modules.splfi.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.jeecg.modules.documents.shippingDetails.entity.SyShippingDetailsItem;
 import org.jeecg.modules.documents.shippingDetails.entity.VO.SyShippingDetailsVo;
+import org.jeecg.modules.documents.shippingDetails.mapper.SyShippingDetailsItemMapper;
+import org.jeecg.modules.documents.shippingDetails.service.impl.SyShippingDetailsItemServiceImpl;
 import org.jeecg.modules.splfi.entity.SyPackingListFabric;
 import org.jeecg.modules.splfi.entity.SyPackingListFabricItem;
 import org.jeecg.modules.splfi.mapper.SyPackingListFabricItemMapper;
@@ -33,6 +36,8 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 	private SyPackingListFabricMapper syPackingListFabricMapper;
 	@Autowired
 	private SyPackingListFabricItemMapper syPackingListFabricItemMapper;
+	@Autowired
+	private SyShippingDetailsItemMapper syShippingDetailsItemMapper;
 	
 	@Override
 	@Transactional
@@ -41,17 +46,23 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 		syPackingListFabric.setStatus("0");
 		syPackingListFabric.setDocumentNo(oConvertUtils.getId());//单据号
 		syPackingListFabricMapper.insert(syPackingListFabric);
-		Map<String,String> mapId=new HashMap<String, String>();//key为梵语明细子表id，value为分组id
+		Map<String,String> mapId=new HashMap<String, String>();//key为发运明细子表id，value为分组id
 		for(SyPackingListFabricItem entity:syPackingListFabric.getSyPackingListFabricItem()) {
 			String key=entity.getSyShippingDetailsId();//获取发运明细子表id
-			if(!mapId.containsKey(key)){//如果这个id没有分组id,就生成一个新的分组id
-				mapId.put(key,oConvertUtils.getId());
+			if(!mapId.containsKey(key)){//如果这个发运明细id没有分组id,就生成一个新的分组id
 				mapId.put(key,oConvertUtils.getId());
 			}
 			entity.setGroupId(mapId.get(key));//分组id
-			//外键设置
-			entity.setSyPackingListFabricId(syPackingListFabric.getId());
-			entity.setDelFlag("0");
+			entity.setSyPackingListFabricId(syPackingListFabric.getId());//外键设置
+			entity.setDelFlag("0");//新增数据设置成未删除
+			//获取该发运明细子表数据，回写剩余数量
+			SyShippingDetailsItem detailsItem=syShippingDetailsItemMapper.selectById(entity.getSyShippingDetailsItemId());
+			detailsItem.setIsReference(1);//修改成已被参照
+			//剩余数量-这次入库数量=新剩余数量
+			detailsItem.setSurplusQuantity(detailsItem.getSurplusQuantity().subtract(entity.getInventoryQuantity()));
+			//此次入库数量-剩余数量=超发数量
+			detailsItem.setExcessQuantity(entity.getInventoryQuantity().subtract(detailsItem.getSurplusQuantity()));
+			syShippingDetailsItemMapper.updateById(detailsItem);
 			syPackingListFabricItemMapper.insert(entity);
 		}
 		return syPackingListFabric;

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

@@ -129,6 +129,8 @@ public class SyPackingListTailoringController {
 	 public Result<IPage<SyPreAssembledPackingListVo>> queryPageList2(SyPreAssembledPackingListVo syPreAssembledPackingListVo,
 																	  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 																	  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+																	  String stratDate,
+																	  String endDate,
 																	  HttpServletRequest req) {
 		 //System.out.println("当前登录用户:"+((LoginUser)SecurityUtils.getSubject().getPrincipal()).getRealname());
 		 QueryWrapper<SyPreAssembledPackingListVo> queryWrapper =new QueryWrapper<>();//初始化
@@ -140,9 +142,9 @@ public class SyPackingListTailoringController {
 		 if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getDistributionPoint())){
 			 queryWrapper.eq("b.distribution_Point",syPreAssembledPackingListVo.getDistributionPoint());//分销点
 		 }
-		 if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getPreDeliveryDate())){
+/*		 if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getPreDeliveryDate())){
 			 queryWrapper.eq("b.hod",syPreAssembledPackingListVo.getPreDeliveryDate());//预发货日期
-		 }
+		 }*/
 		 if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getSmallPo())){
 			 queryWrapper.eq("b.small_po",syPreAssembledPackingListVo.getSmallPo());//小po
 		 }
@@ -155,6 +157,13 @@ public class SyPackingListTailoringController {
 		 if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getProductName())){
 			 queryWrapper.eq("a.product_Name",syPreAssembledPackingListVo.getProductName());//品名
 		 }
+		 //预发货日期
+		 if(oConvertUtils.isNotEmpty(stratDate)){//起始
+			 queryWrapper.ge("b.hod",stratDate);
+		 }
+		 if(oConvertUtils.isNotEmpty(endDate)){//结束
+			 queryWrapper.le("b.hod",endDate);
+		 }
 		 Page<SyPreAssembledPackingListVo> page = new Page<SyPreAssembledPackingListVo>(pageNo, pageSize);
 		 IPage<SyPreAssembledPackingListVo> pageList = syPreAssembledPackingListService.selectPage(page, queryWrapper);
 		 return Result.OK(pageList);