修改预装箱单同步预托书数据

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/controller/SyPreAssembledPackingListController.java

@@ -1,7 +1,6 @@
 package org.jeecg.modules.spapl.controller;
 
 import java.io.IOException;
-import java.lang.reflect.Array;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
@@ -12,14 +11,9 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
-import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.system.base.controller.JeecgController;
-import org.jeecg.common.system.util.JwtUtil;
-import org.jeecg.common.util.RedisUtil;
 import org.jeecg.modules.documents.letterDeposit.entity.SyLetterDepositItem;
-import org.jeecg.modules.documents.shippingDetails.entity.SyShippingDetailsItem;
 import org.jeecg.modules.documents.shippingDetails.entity.VO.SyShippingDetailsVo;
-import org.jeecg.modules.documents.shippingDetails.service.impl.SyShippingDetailsItemServiceImpl;
 import org.jeecg.modules.openApi.entity.DxpDataPlan;
 import org.jeecg.modules.openApi.service.IDxpDataPlanService;
 import org.jeecg.modules.spapl.vo.PackingHeaderVo;
@@ -38,7 +32,6 @@ import org.jeecg.modules.spapl.service.ISyPreAssembledPackingListService;
 import org.jeecg.modules.spapl.service.ISyPreAssembledPackingListItemService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.multipart.MultipartFile;
@@ -68,8 +61,6 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
 	private ISyPreAssembledPackingListItemService syPreAssembledPackingListItemService;
 	@Autowired
 	private IDxpDataPlanService iDxpDataPlanService;
-	@Autowired
-	private RedisUtil redisUtil;
 
 	/**
 	 * 分页列表查询
@@ -162,20 +153,38 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
 	 @ApiOperation(value="参照发运明细", notes="参照发运明细")
 	 @GetMapping(value = "/list3")
 	 public Result<IPage<SyShippingDetailsVo>> queryPageList3(
-	 								 @RequestParam(name="documentNo",required = false) String documentNo,
-									 @RequestParam(name="customer",required = false) String customer,
+	 								 @RequestParam(name="documentNo") String documentNo,
+									 @RequestParam(name="customer") String customer,
+									 @RequestParam(name="distributionPoint") String distributionPoint,
+									 @RequestParam(name="startDate") String startDate,
+									 @RequestParam(name="smallPo") String smallPo,
+									 @RequestParam(name="endDate") String endDate,
 									 @RequestParam(name="status", defaultValue="y") String status,
 									 @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 									 @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 									 HttpServletRequest req) {
-		//只有成衣才能被选中,筛选为成衣的订单,需要加个条件
+		 //只有成衣才能被选中,筛选为成衣的订单,需要加个条件
+		 //po  分销点 预发货日期 客户
 		 Result<IPage<SyShippingDetailsVo>> result = new Result<IPage<SyShippingDetailsVo>>();
 		 QueryWrapper<SyShippingDetailsVo> queryWrapper = new QueryWrapper<>();
 		 if(oConvertUtils.isNotEmpty(documentNo)) {
 			 queryWrapper.eq("t.documentNo", documentNo);//单据号
 		 }
-		 if(oConvertUtils.isNotEmpty(customer)){
-			 queryWrapper.eq("t.customer",customer);//客户
+		 if(oConvertUtils.isNotEmpty(customer)){//客户
+			 queryWrapper.eq("t.customer",customer).or().eq("t.customer_Abbreviation",customer);
+		 }
+		 if(oConvertUtils.isNotEmpty(distributionPoint)){//分销点
+			 queryWrapper.eq("t.distribution_Point",distributionPoint);
+		 }
+		 if(oConvertUtils.isNotEmpty(smallPo)){//小po
+			 queryWrapper.eq("t.small_Po",smallPo);
+		 }
+		 //预发货日期
+		 if(oConvertUtils.isNotEmpty(startDate)){//起始
+			 queryWrapper.ge("b.pre_Delivery_Date",startDate);
+		 }
+		 if(oConvertUtils.isNotEmpty(endDate)){//结束
+			 queryWrapper.le("b.pre_Delivery_Date",endDate);
 		 }
 		 if(oConvertUtils.isNotEmpty(status)){//选择正常或者超发状态
 		 	 if(status.equals("n")){
@@ -328,7 +337,7 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
 
 			 String url = resultList.get(0).getItemIp() + resultList.get(0).getItemUrl();//拼接url
 
-			 String tokenUrl = resultList.get(1).getItemIp()+resultList.get(1).getItemUrl();//获取token
+			 String tokenUrl = resultList.get(1).getItemIp()+resultList.get(1).getItemUrl();//获取云工厂token
 
 			 if(oConvertUtils.isEmpty(url)||oConvertUtils.isEmpty(tokenUrl)){
 			 	log.warn("缺少推送接口信息" );
@@ -399,7 +408,7 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
 
 			String url = resultList.get(0).getItemIp() + resultList.get(0).getItemUrl();//拼接url
 
-			String tokenUrl = resultList.get(1).getItemIp()+resultList.get(1).getItemUrl();//获取token
+			String tokenUrl = resultList.get(1).getItemIp()+resultList.get(1).getItemUrl();//获取云工厂token
 
 			if(oConvertUtils.isEmpty(url)||oConvertUtils.isEmpty(tokenUrl)){
 				log.warn("缺少推送接口信息" );
@@ -437,42 +446,6 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
 		return result;
 	}
 
-	/**
-	 * 获取token
-	 *
-	 * @param username,syspassword
-	 * @return
-	 */
-	@AutoLog(value = "获取token")
-	@ApiOperation(value="获取token", notes="获取token")
-	@RequestMapping(value = "/getToken", method = {RequestMethod.GET})
-	public String getToken(String username,String syspassword) {
-		String token = JwtUtil.sign(username, syspassword);
-		redisUtil.set(CommonConstant.PREFIX_USER_TOKEN + token, token);
-		redisUtil.expire(CommonConstant.PREFIX_USER_TOKEN + token, JwtUtil.EXPIRE_TIME * 2 / 1000);
-		System.out.println("CommonConstant.PREFIX_USER_TOKEN"+CommonConstant.PREFIX_USER_TOKEN);
-		System.out.println("JwtUtil.EXPIRE_TIME"+JwtUtil.EXPIRE_TIME);
-		return token;
-	}
-
-
-	/**
-	 * 类型转化
-	 *
-	 * @param syPreAssembledPackingListItem
-	 * @return
-	 */
-	@AutoLog(value = "类型转化")
-	@ApiOperation(value="类型转化", notes="类型转化")
-	@RequestMapping(value = "/typeConversion", method = {RequestMethod.POST})
-	public SyLetterDepositItem getToken(@RequestBody SyPreAssembledPackingListItem syPreAssembledPackingListItem) {
-		System.out.println(syPreAssembledPackingListItem.getBoxNumber());
-		SyLetterDepositItem po = new SyLetterDepositItem();
-		BeanUtils.copyProperties(syPreAssembledPackingListItem, po);
-		return po;
-	}
-
-
 	 /**
 	  * 提交
 	  *
@@ -827,4 +800,17 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
 		syPreAssembledPackingListService.updateShipping();
 		return "true";
 	}
+
+	/**
+	 * 类型转化
+	 *
+	 * @param syPreAssembledPackingListItem
+	 * @return
+	 */
+	@AutoLog(value = "类型转化")
+	@ApiOperation(value="类型转化", notes="类型转化")
+	@RequestMapping(value = "/typeConversion", method = {RequestMethod.POST})
+	public SyLetterDepositItem typeConversion(@RequestBody SyPreAssembledPackingListItem syPreAssembledPackingListItem) {
+		return syPreAssembledPackingListService.typeConversion(syPreAssembledPackingListItem);
+	}
 }

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

@@ -229,6 +229,12 @@ public class SyPreAssembledPackingListItem implements Serializable {
 	@ApiModelProperty(value = "二维表格")
 	private List<SizeTable> sizeTables;
 
+	/**二维表格*/
+	@TableField(exist = false)
+	//@ExcelCollection(name="二维表格")
+	@ApiModelProperty(value = "计划尺码数量")
+	private String planSize;
+
 	/**存货编码*/
 	@Excel(name = "存货编码", width = 15)
 	@ApiModelProperty(value = "存货编码")

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/mapper/xml/SyPreAssembledPackingListItemMapper.xml

@@ -76,7 +76,8 @@
 		 	sy_shipping_details_item.sy_order_data_id sy_order_data_id,/*订单数据主表id s*/
 		 	sy_shipping_details_item.sy_order_data_item_id sy_order_data_item_id,/*订单数据子表id s*/
             sy_shipping_details_item.pre_delivery_date hod, /*预发货日期 m*/
-          	sy_shipping_details_item.order_Number poNo, /*pono 发育明细子表订单号 sxx*/
+          	sy_shipping_details_item.small_Po poNo, /*pono 发育明细子表订单号 sxx*/
+          	sy_shipping_details_item.small_Po small_Po, /*小po*/
 		 	sy_shipping_details_item.account acSetNo,/*单据号 s*/
 		 	sy_shipping_details_item.garment_Factory garment_Factory, /*成衣工厂*/
 			sy_shipping_details_item.distribution_point distributionPoint,/*分销点 s*/

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

@@ -3,6 +3,7 @@ package org.jeecg.modules.spapl.service;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.documents.letterDeposit.entity.SyLetterDepositItem;
 import org.jeecg.modules.documents.shippingDetails.entity.VO.SyShippingDetailsVo;
 import org.jeecg.modules.spapl.entity.SizeTable;
 import org.jeecg.modules.spapl.entity.SyPreAssembledPackingListItem;
@@ -96,4 +97,10 @@ public interface ISyPreAssembledPackingListService extends IService<SyPreAssembl
 	public String submitBatch(String [] ids);
 
 	public String updateShipping();
+
+	/**
+	 * 类型转换
+	 * @return SyLetterDepositItem
+	 */
+	public SyLetterDepositItem typeConversion(SyPreAssembledPackingListItem syPreAssembledPackingListItem);
 }

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

@@ -32,6 +32,12 @@ public class SyPreAssembledPackingListItemServiceImpl extends ServiceImpl<SyPreA
 		for(SyPreAssembledPackingListItem spapl_item : list){
 			List<SizeTable> sizes=syPreAssembledPackingListItemMapper.querySize2(spapl_item.getGroupId(),spapl_item.getSyPreAssembledPackingListId());
 			sizes=sort(sizes);
+			String planSize="";
+			for (SizeTable size : sizes){
+				planSize=planSize+size.getSize()+":"+size.getQuantity().intValue()+"+";
+			}
+			planSize=planSize.substring(0,planSize.length()-1);
+			spapl_item.setPlanSize(planSize);
 			spapl_item.setSizeTables(sizes);
 		}
 		return list;

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

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.hibernate.engine.jdbc.Size;
 import org.jeecg.common.exception.JeecgBootException;
 import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.documents.letterDeposit.entity.SyLetterDepositItem;
+import org.jeecg.modules.documents.letterDeposit.mapper.SyLetterDepositItemMapper;
 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;
@@ -18,6 +20,7 @@ import org.jeecg.modules.spapl.service.ISyPreAssembledPackingListService;
 import org.jeecg.modules.spapl.vo.PackingHeaderVo;
 import org.jeecg.modules.spapl.vo.PackingLineVo;
 import org.jeecg.modules.spapl.vo.SyPreAssembledPackingListVo;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -48,6 +51,8 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 	private SyShippingDetailsMapper syShippingDetailsMapper;
 	@Autowired
 	private SyShippingDetailsItemMapper syShippingDetailsItemMapper;
+	@Autowired
+	private SyLetterDepositItemMapper syLetterDepositItemMapper;
 
 	BigDecimal add(List<SyPreAssembledPackingListItem> items,String pid){
 		BigDecimal box=new BigDecimal(0);//获取总箱数
@@ -150,7 +155,8 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 				syItem.setExcessQuantity(total.subtract(syItem.getShipmentQuantity()));
 				//标识已被参照
 				syItem.setIsReference(1);
-				syShippingDetailsItemMapper.updateById(syItem);//修改
+				syShippingDetailsItemMapper.updateById(syItem);//修改发运明细发货数量和超出数量
+				typeConversion(item1);//修改预托书数量
 			}
 		}
 		return box;
@@ -285,9 +291,13 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 		for(SyPreAssembledPackingListItem item :list){
 			sizes=syPreAssembledPackingListItemMapper.querySize(item.getSyDeclarationElementsId(),item.getGroupId());//获取尺码信息
 			int row=0;
+			String planSize="";
 			for (SizeTable size : sizes){
+				planSize=planSize+size.getSize()+":"+size.getQuantity().intValue()+"+";
 				size.setNum(++row);
 			}
+			planSize=planSize.substring(0,planSize.length()-1);
+			item.setPlanSize(planSize);
 			item.setSizeTables(sizes);
 		}
 		sizes=syPreAssembledPackingListItemMapper.querySizes(id);
@@ -368,4 +378,18 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 		return "true";
 	}
 
+	@Override
+	public SyLetterDepositItem typeConversion(SyPreAssembledPackingListItem syPreAssembledPackingListItem) {
+		QueryWrapper queryWrapper=new QueryWrapper();
+		queryWrapper.eq("sy_pre_assembled_packing_list_item_id",syPreAssembledPackingListItem.getId());
+		SyLetterDepositItem syLetterDepositItem=syLetterDepositItemMapper.selectOne(queryWrapper);
+		if(syLetterDepositItem!=null){
+			String id=syLetterDepositItem.getId();//保存预托书id防止覆盖
+			BeanUtils.copyProperties(syPreAssembledPackingListItem, syLetterDepositItem);
+			syLetterDepositItem.setId(id);//重新赋值
+			syLetterDepositItemMapper.updateById(syLetterDepositItem);//修改预托书数据
+		}
+		return syLetterDepositItem;
+	}
+
 }