| src/main/java/com/zy/asrs/controller/LocMastController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/controller/OpenController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/resources/application.yml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/zy/asrs/controller/LocMastController.java
@@ -19,6 +19,7 @@ import com.zy.common.model.Shelves; import com.zy.common.web.BaseController; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.*; import java.util.*; @@ -30,6 +31,14 @@ private LocMastService locMastService; @Autowired private LocDetlService locDetlService; @Value("${channel.equipmentRow}") private Integer equipmentRow; @Value("${channel.quietRow}") private Integer quietRow; @Value("${channel.equipmentCount}") private Integer equipmentCount; @Value("${channel.channelMax}") private Integer channelMax; @RequestMapping(value = "/locMast/init/pwd") public R locMastInitPwd(@RequestParam(required = false) String pwd) { @@ -195,11 +204,20 @@ locMast.setAppeTime(now); locMast.setModiUser(getUserId()); locMast.setModiTime(now); if (r==equipmentRow){ locMast.setChannel(l+(b-2)*param.getEndLev()); locMast.setLocType1((short)1); int i = (locMast.getChannel() - 1) / (channelMax / equipmentCount) + 1; locMast.setLocType2((short)i); } if (r==quietRow){ locMast.setLocType1((short)2); } list.add(locMast); } } } // locMastService.delete(new EntityWrapper<>()); locMastService.delete(new EntityWrapper<>()); locDetlService.delete(new EntityWrapper<>()); locMastService.insertBatch(list); return R.ok("初始化成功"); src/main/java/com/zy/asrs/controller/OpenController.java
@@ -6,7 +6,6 @@ import com.core.exception.CoolException; import com.zy.asrs.entity.TestMast; import com.zy.asrs.entity.param.*; import com.zy.asrs.service.ApiLogService; import com.zy.asrs.service.OpenService; import com.zy.common.model.DetlDto; import com.zy.common.web.BaseController; @@ -32,8 +31,6 @@ @Autowired private OpenService openService; @Autowired private ApiLogService apiLogService; @PostMapping("/order/matSync/default/v1") @AppAuth(memo = "商品信息同步接口") @@ -211,16 +208,10 @@ public synchronized R hostName(@RequestHeader(required = false) String appkey, @RequestBody(required = false) HeartBeat param, HttpServletRequest request) { appkey = "ea1f0459efc02a79f046f982767939ae"; auth(appkey, param, request); if (Cools.isEmpty(param)) { return R.parse(BaseRes.PARAM); } //........ System.out.println(String.format("id:%s,hostName:%s,requestTime:%s", param.getId(), param.getHostName(), param.getRequestTime())); return R.ok(); } @@ -229,29 +220,16 @@ public synchronized R combPack(@RequestHeader(required = false) String appkey, @RequestBody(required = false) CombParam param, HttpServletRequest request) { appkey = "ea1f0459efc02a79f046f982767939ae"; log.info("入库通知单接口调用"+appkey+param); auth(appkey, param, request); if (Cools.isEmpty(param)) { return R.parse(BaseRes.PARAM); } //生成入库通知档 openService.combPACK(param); Map<String, Boolean> map = new HashMap<>(); apiLogService.save( "mes申请入库", "172.28.15.251", null, "127.0.0.1", JSON.toJSONString("PackNo:" + param.getPackNo() + " PackName:" + param.getPackName() + " RequestTime:" + param.getRequestTime() + " SettingTimes:" + param.getSettingTimes()), "172.28.15.251", true ); map.put("isComplete", true); return R.ok(map); // Map<String, Boolean> map = new HashMap<>(); // map.put("isComplete", true); return R.ok(); } @PostMapping("/rpc/pakOut/auth/v1") src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -25,9 +25,6 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; /** @@ -590,18 +587,12 @@ int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",param.getPackNo())); int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet",param.getPackNo())); int countPakin = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet",param.getPackNo())); if (countLoc > 0 || countWrk > 0) { throw new CoolException("工作档/库存条码数据已存在===>>" + param.getPackNo()); }else if (countPakin>0){ throw new CoolException("重复申请" + param.getPackNo()); } SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); java.util.Date date1=null; try { date1= sdf.parse(param.getRequestTime()); } catch (ParseException e) { e.printStackTrace(); } java.sql.Date requestTime = new java.sql.Date(date1.getTime()); // 生成入库通知档 // Mat mat = matService.selectByMatnr(param.getPackName()); @@ -616,7 +607,7 @@ waitPakin.setIoStatus("N"); // 入出状态 waitPakin.setAnfme(1.0); // 数量 waitPakin.setStatus("Y"); // 状态 waitPakin.setManuDate(requestTime.toString()); waitPakin.setManuDate(param.getRequestTime()); waitPakin.setAppeUser(null); waitPakin.setAppeTime(new Date()); waitPakin.setModiUser(null); @@ -651,12 +642,6 @@ throw new CoolException("PACK码为："+param.getPackNo()+"的货物库位状态不是“F”"); }else if (locMast.getFireStatus()!=0){ throw new CoolException("警告！！！PACK码为："+param.getPackNo()+"的库位："+locMast.getLocNo()+"消防状态异常！！！"); // }else if (locMast.getFireStatus()!=0){ // throw new CoolException("警告！！！PACK码为："+param.getPackNo()+"的库位："+locMast.getLocNo()+"消防状态异常！！！"); // }else if (locMast.getFireStatus()!=0){ // throw new CoolException("警告！！！PACK码为："+param.getPackNo()+"的库位："+locMast.getLocNo()+"消防状态异常！！！"); // }else if (locMast.getFireStatus()!=0){ // throw new CoolException("警告！！！PACK码为："+param.getPackNo()+"的库位："+locMast.getLocNo()+"消防状态异常！！！"); }else { Date now = new Date(); Integer ioType = 101; //入出库类型 src/main/resources/application.yml
@@ -66,6 +66,10 @@ channelMax: 48 # 充放电测试柜数量 equipmentCount: 6 # 测试库位所在排号 equipmentRow: 1 # 静置库位所在排号 quietRow: 2 # 充放电测试系统 ren:
