装箱单面料添加

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

@@ -3,6 +3,7 @@ package org.jeecg.modules.splfi.controller;
 import java.io.UnsupportedEncodingException;
 import java.io.IOException;
 import java.net.URLDecoder;
+import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -10,6 +11,8 @@ import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
+import org.jeecg.common.system.util.JwtUtil;
 import org.jeecg.common.system.vo.LoginUser;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.util.oConvertUtils;
@@ -137,14 +140,17 @@ public class SyPackingListFabricController {
 	 @AutoLog(value = "提供发运明细id获取数据")
 	 @ApiOperation(value="提供发运明细id获取数据", notes="提供发运明细id获取数据")
 	 @GetMapping(value = "/getShippingDetailId")
-	 public Result<SyPackingListFabric>  getSyShippingDetailsData(String[] ids){
+	 public Result<SyPackingListFabric>  getSyShippingDetailsData(String[] ids,String token) throws ParseException {
 		 Result<SyPackingListFabric> result=new Result<>();
 		if(oConvertUtils.isEmpty(ids)){
 			result.setMessage("id不能为空");
 			result.setSuccess(false);
 			return result;
 		}
-		result.setResult(syPackingListFabricService.getSyShippingDetailsData(ids));
+		SyPackingListFabric syPackingListFabric=syPackingListFabricService.getSyShippingDetailsData(ids);
+		 System.out.println("token\t"+token);
+		syPackingListFabric.setPreparedBy(JwtUtil.getUsername(token));
+		result.setResult(syPackingListFabric);
 		result.setSuccess(true);
 		result.setMessage("成功");
 		return result;

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/entity/SyPackingListFabric.java

@@ -69,8 +69,8 @@ public class SyPackingListFabric implements Serializable {
 	@ApiModelProperty(value = "集装箱号")
 	private String containerNumber;
 	/**装柜日期*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
 	@ApiModelProperty(value = "装柜日期")
 	private Date latestDateOfShipment;
 	/**成衣工厂*/
@@ -83,8 +83,8 @@ public class SyPackingListFabric implements Serializable {
 	@ApiModelProperty(value = "制单人")
 	private String preparedBy;
 	/**制单日期*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
 	@ApiModelProperty(value = "制单日期")
 	private Date preparedDate;
 	/**外销发票号*/

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

@@ -7,6 +7,7 @@ import org.jeecg.modules.splfi.entity.SyPackingListFabricItem;
 import org.jeecg.modules.splfi.entity.SyPackingListFabric;
 import com.baomidou.mybatisplus.extension.service.IService;
 import java.io.Serializable;
+import java.text.ParseException;
 import java.util.Collection;
 import java.util.List;
 
@@ -50,7 +51,7 @@ public interface ISyPackingListFabricService extends IService<SyPackingListFabri
 	public List<SyPackingListFabric> getSyShippingDetailsDatas(String[] ids);
 
 	//根据id获取发运明细数据
-	public SyPackingListFabric getSyShippingDetailsData(String[] ids);
+	public SyPackingListFabric getSyShippingDetailsData(String[] ids) throws ParseException;
 
 	//根据id获取主表子表汇总数据
 	public SyPackingListFabric selectById(String id);

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

@@ -2,15 +2,19 @@ package org.jeecg.modules.splfi.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.shiro.SecurityUtils;
+import org.jeecg.common.system.vo.LoginUser;
 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.spapl.entity.SyPreAssembledPackingList;
 import org.jeecg.modules.splfi.entity.SyPackingListFabric;
 import org.jeecg.modules.splfi.entity.SyPackingListFabricItem;
 import org.jeecg.modules.splfi.mapper.SyPackingListFabricItemMapper;
 import org.jeecg.modules.splfi.mapper.SyPackingListFabricMapper;
 import org.jeecg.modules.splfi.service.ISyPackingListFabricService;
+import org.jeecg.modules.system.entity.SysUser;
 import org.jeecg.modules.system.util.oConvertUtils;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
@@ -18,10 +22,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import java.io.Serializable;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Collection;
-import java.util.Map;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 /**
  * @Description: 面料装箱单
@@ -127,8 +130,10 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 
 	//可能会获取多条数据头表数据，头表不知选那条数据
 	@Override
-	public  SyPackingListFabric getSyShippingDetailsData(String[] ids) {
+	public  SyPackingListFabric getSyShippingDetailsData(String[] ids) throws ParseException {
+		String time= new SimpleDateFormat("yyyy-MM-dd").format(System.currentTimeMillis());
 		SyPackingListFabric syPackingListFabric=new SyPackingListFabric();
+		syPackingListFabric.setPreparedDate(new SimpleDateFormat("yyyy-MM-dd").parse(time));
 		syPackingListFabric.setSyPackingListFabricItem(syPackingListFabricItemMapper.getSyShippingDetailsDatas(ids));
 		return syPackingListFabric;
 	}