发票日期更改为最终船期

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

@@ -2548,7 +2548,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 			jsonObject1.put("CGLTYPE","销售出库单");//上游单据
 			jsonObject1.put("CDEFINE11",syPackingListFabric.getEndCustomer());//最终客户
 
-			jsonObject1.put("DDATE",syPackingListFabric.getLatestDateOfShipment2().substring(0,10));//日期
+			jsonObject1.put("DDATE",syPackingListFabric.getTheFinalShippingDate().substring(0,10));//日期
 			jsonObject1.put("CDEFINE4",syPackingListFabric.getTheFinalShippingDate());//最终船期
 			jsonObject1.put("CDEFINE6",syPackingListFabric.getTheFinalShippingDate2());//合同日期
 			jsonObject1.put("CDEFINE10",syPackingListFabric.getShippingOrderNumber());//托书号

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

@@ -1253,58 +1253,30 @@ public class SyPackingListTailoringController implements Job {
 	 /**
 	  * 获取token
 	  *
-	  * @param username,syspassword
 	  * @return
 	  */
-	 @AutoLog(value = "获取token")
-	 @ApiOperation(value="获取token", notes="获取token")
-	 @RequestMapping(value = "/getToken", method = {RequestMethod.GET})
-	 public Result getToken(HttpServletRequest request,String username,String syspassword) {
-		 String accessToken = request.getHeader("X-Access-Token");
-		 System.out.println("token的值为:\t"+accessToken);
+	 @AutoLog(value = "设置redis字符")
+	 @ApiOperation(value="设置redis字符", notes="设置redis字符")
+	 @RequestMapping(value = "/setRedis", method = {RequestMethod.GET})
+	 public Result setToken(String key,String value) {
 		 Result result=new Result();
-		 if (true){
-			 result.setResult(redisUtil.get(CommonConstant.SQL_INDEX_UNIQ_SYS_USER_USERNAME));
-			 return result;
-		 }
-		 if(redisUtil.get(CommonConstant.PREFIX_USER_TOKEN + "testData")!=null){
-			 result.setTimestamp(redisUtil.getExpire(CommonConstant.PREFIX_USER_TOKEN + "testData"));
-			 result.setResult(redisUtil.get(CommonConstant.PREFIX_USER_TOKEN + "testData"));
-		 }else{
-			 String token = JwtUtil.sign(username, syspassword);//生成token
-			 redisUtil.set(CommonConstant.PREFIX_USER_TOKEN + "testData", token);
-			 redisUtil.expire(CommonConstant.PREFIX_USER_TOKEN + "testData", JwtUtil.EXPIRE_TIME * 2 / 1000);
-			 result.setTimestamp(redisUtil.getExpire(CommonConstant.PREFIX_USER_TOKEN + "testData"));
-			 result.setResult(redisUtil.get(CommonConstant.PREFIX_USER_TOKEN + "testData"));
-		 }
+		 redisUtil.set(key, value);//采购委外入库单
+		 result.setMessage(value);
 		 return result;
 	 }
 
+
 	 /**
 	  * 获取token
 	  *
 	  * @return
 	  */
-	 @AutoLog(value = "初始化流水号")
-	 @ApiOperation(value="初始化流水号", notes="初始化流水号")
-	 @RequestMapping(value = "/getSno", method = {RequestMethod.GET})
-	 public Result getToken1(String token,String name) {
+	 @AutoLog(value = "获取redis字符")
+	 @ApiOperation(value="获取redis字符", notes="获取redis字符")
+	 @RequestMapping(value = "/getRedis", method = {RequestMethod.GET})
+	 public Result getToken(String key) {
 		 Result result=new Result();
-//		 if(redisUtil.get("pushNo")!=null){
-//			 result.setTimestamp(redisUtil.getExpire("pushNo"));
-//			 result.setResult(redisUtil.get("pushNo"));
-//		 }else{
-		 //String token = redisUtil.get("采购入库单").toString();//生成token
-		 //token=org.jeecg.modules.system.util.oConvertUtils.addOne(token);
-		// String token = "dz0000001";
-		 //token=org.jeecg.modules.system.util.oConvertUtils.addOne(token);
-		 redisUtil.set(name, token);//采购委外入库单
-		 result.setMessage(token);
-		 //redisUtil.expire("采购入库单", -1); //redis-server.exe /path/to/redis.conf
-		 //result.setTimestamp(redisUtil.getExpire("采购入库单"));
-		 //result.setResult(redisUtil.get("采购入库单"));
-		// result.setMessage("采购入库单");
-//		 }
+		 result.setMessage(redisUtil.get(key).toString());
 		 return result;
 	 }
 	 /**

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

@@ -2021,7 +2021,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 
 			jsonObject1.put("CGLTYPE","入库单");//上游单据
 			System.out.println("syPackingListTailoring.getLatestDateOfShipment2()\t"+syPackingListTailoring.getLatestDateOfShipment2());
-			jsonObject1.put("DDATE",syPackingListTailoring.getLatestDateOfShipment2().substring(0,10));//装运期限
+			jsonObject1.put("DDATE",syPackingListTailoring.getTheFinalShippingDate().substring(0,10));//装运期限
 			jsonObject1.put("CDEFINE4",syPackingListTailoring.getTheFinalShippingDate().substring(0,10));//最终船期
 			jsonObject1.put("CDEFINE6",syPackingListTailoring.getTheFinalShippingDate2().substring(0,10));//合同日期
 			jsonObject1.put("CDEFINE10",syPackingListTailoring.getShippingOrderNumber());//托书号
@@ -2181,7 +2181,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 			}else{
 				//maps.put("account","104");//账套号
 			}
-			jsonObject1.put("DDATE",syPackingListTailoring.getLatestDateOfShipment2().substring(0,10));//日期
+			jsonObject1.put("DDATE",syPackingListTailoring.getTheFinalShippingDate().substring(0,10));//日期
 			jsonObject1.put("CDEFINE4",syPackingListTailoring.getTheFinalShippingDate());//最终船期
 			jsonObject1.put("CDEFINE6",syPackingListTailoring.getTheFinalShippingDate2());//合同日期
 			jsonObject1.put("CDEFINE10",syPackingListTailoring.getShippingOrderNumber());//托书号