From cdcfca91ded792ab73f786a81cdccde8475b3e0c Mon Sep 17 00:00:00 2001 From: Junjie <fallin.jie@qq.com> Date: 星期六, 07 十月 2023 16:03:51 +0800 Subject: [PATCH] #新增许可证 --- src/main/java/com/zy/asrs/controller/LocMastController.java | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/LocMastController.java b/src/main/java/com/zy/asrs/controller/LocMastController.java index f096994..070ad5f 100644 --- a/src/main/java/com/zy/asrs/controller/LocMastController.java +++ b/src/main/java/com/zy/asrs/controller/LocMastController.java @@ -12,9 +12,11 @@ import com.core.common.R; import com.zy.asrs.entity.LocDetl; import com.zy.asrs.entity.LocMast; +import com.zy.asrs.entity.WrkMast; import com.zy.asrs.entity.param.LocMastInitParam; import com.zy.asrs.service.LocDetlService; import com.zy.asrs.service.LocMastService; +import com.zy.asrs.service.WrkMastService; import com.zy.common.entity.Parameter; import com.zy.common.model.Shelves; import com.zy.common.web.BaseController; @@ -39,6 +41,8 @@ private Integer equipmentCount; @Value("${channel.channelMax}") private Integer channelMax; + @Autowired + private WrkMastService wrkMastService; @RequestMapping(value = "/locMast/init/pwd") public R locMastInitPwd(@RequestParam(required = false) String pwd) { @@ -82,7 +86,7 @@ wrapper.ge(entry.getKey(), DateUtils.convert(dates[0])); wrapper.le(entry.getKey(), DateUtils.convert(dates[1])); } else { - if (entry.getKey().equals("loc_type2")){ + if (entry.getKey().equals("loc_type1")){ wrapper.eq(entry.getKey(), val); }else { wrapper.like(entry.getKey(), val); @@ -118,6 +122,11 @@ locDetlService.delete(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo())); } } + if(locMast.getFreeze()==1&&locMast.getPackStatus()==6){ + locMast.setPackStatus(5); + locMast.setLocSts("F"); + wrkMastService.delete(new EntityWrapper<WrkMast>().eq("source_loc_no",locMast.getLocNo())); + } locMast.setModiUser(getUserId()); locMast.setModiTime(new Date()); locMastService.updateById(locMast); -- Gitblit v1.9.1