装箱单

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

@@ -134,6 +134,8 @@ public class SyPackingListTailoringController {
 		 //System.out.println("当前登录用户:"+((LoginUser)SecurityUtils.getSubject().getPrincipal()).getRealname());
 		 QueryWrapper<SyPreAssembledPackingListVo> queryWrapper =new QueryWrapper<>();//初始化
 		 queryWrapper.eq("a.del_flag","0");//默认查询未删除
+		 queryWrapper.eq("a.status","1");//查询已提交数据
+		 queryWrapper.eq("a.is_Reference","1");//查询已提交数据
 		 if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getCustomerAbbreviation())){
 			 queryWrapper.eq("a.customer_Abbreviation",syPreAssembledPackingListVo.getCustomerAbbreviation());//客户简称
 		 }
@@ -221,8 +223,8 @@ public class SyPackingListTailoringController {
 	  */
 	 @AutoLog(value = "装箱单成衣-提交")
 	 @ApiOperation(value="装箱单成衣-提交", notes="装箱单成衣-提交")
-	 @RequestMapping(value = "/submit", method = {RequestMethod.PUT,RequestMethod.POST})
-	 public Result<?> submit(@RequestBody String id) {
+	 @RequestMapping(value = "/submit", method = {RequestMethod.GET})
+	 public Result<?> submit(String id) {
 	 	Result result=new Result();
 	 	if(oConvertUtils.isEmpty(id)){
 	 		result.setMessage("id为空");
@@ -248,8 +250,8 @@ public class SyPackingListTailoringController {
 	  */
 	 @AutoLog(value = "装箱单成衣-取消提交")
 	 @ApiOperation(value="装箱单成衣-取消提交", notes="装箱单成衣-取消提交")
-	 @RequestMapping(value = "/cancelSubmit", method = {RequestMethod.PUT,RequestMethod.POST})
-	 public Result<?> cancelSubmit(@RequestBody String id) {
+	 @RequestMapping(value = "/cancelSubmit", method = {RequestMethod.GET})
+	 public Result<?> cancelSubmit(String id) {
 		 Result result=new Result();
 		 if(oConvertUtils.isEmpty(id)){
 			 result.setMessage("id为空");
@@ -480,4 +482,18 @@ public class SyPackingListTailoringController {
 		 return result;
 	 }
 
+	 /**
+	  * 获取token
+	  *
+	  * @param
+	  * @return
+	  */
+	 @AutoLog(value = "获取当前用户")
+	 @ApiOperation(value="获取当前用户", notes="获取当前用户")
+	 @RequestMapping(value = "/getUser", method = {RequestMethod.GET})
+	 public Result getUser() {
+		 LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
+		 return Result.ok(sysUser);
+	 }
+
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/vo/SyPackingListTailoringVo.java

@@ -92,7 +92,7 @@ public class SyPackingListTailoringVo {
 	private String pushState;
 	/**单据状态*/
 	@ApiModelProperty(value = "单据状态")
-	private String theDocumentsState;
+	private String status;
 	/**原因*/
 	@ApiModelProperty(value = "原因")
 	private String cause;