| src/main/java/com/zy/api/controller/HWmsApiController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/entity/LocAroundBind.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/service/WorkService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/common/config/AdminInterceptor.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/webapp/static/js/locAroundBind/locAroundBind.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/zy/api/controller/HWmsApiController.java
@@ -1,6 +1,7 @@ package com.zy.api.controller; import com.alibaba.fastjson.JSONObject; import com.zy.api.controller.params.PageRequestParams; import com.zy.api.entity.PubOrderParams; import com.zy.api.entity.ReportOrderParam; @@ -44,6 +45,7 @@ @ApiOperation("入库单下发") @PostMapping("/sendInDispatch") public XSR receiveOrders(@RequestBody List<PubOrderParams> params) { log.info(JSONObject.toJSONString(params)); if (Objects.isNull(params)) { return XSR.error("参数不能为空！！"); } src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java
@@ -123,9 +123,9 @@ // if (!wrkMastService.updateById(mast)) { // throw new CoolException("任务状态更新失败！！"); // } workService.backLocOperation(mast.getWrkNo() + "", mast.getAppeUser()); return R.ok("接收成功，执行回库中..."); return workService.backLocOperation(mast.getWrkNo() + "", mast.getAppeUser()); } /** src/main/java/com/zy/asrs/entity/LocAroundBind.java
@@ -2,9 +2,11 @@ import com.baomidou.mybatisplus.annotations.TableId; import com.baomidou.mybatisplus.enums.IdType; import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableField; import com.core.common.SpringUtils; import com.zy.asrs.service.BasDeviceService; import com.zy.asrs.service.BasLocStsService; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -85,6 +87,15 @@ return "默认"; } } public String getDevNo$() { BasDeviceService bean = SpringUtils.getBean(BasDeviceService.class); BasDevice type = bean.selectOne(new EntityWrapper<BasDevice>().eq("type", devNo)); if (type == null) { return "<UNK>"; }else { return type.getDevNo(); } } public String getLocType$() { if (this.locType == null) { src/main/java/com/zy/asrs/service/WorkService.java
@@ -1,5 +1,6 @@ package com.zy.asrs.service; import com.core.common.R; import com.zy.asrs.entity.BasDevp; import com.zy.asrs.entity.WaitPakin; import com.zy.asrs.entity.WrkMast; @@ -97,7 +98,7 @@ * @param workNo * @param userId */ void backLocOperation(String workNo, Long userId); R backLocOperation(String workNo, Long userId); /** * 通知档手动生成任务 src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -2,10 +2,7 @@ import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.mapper.Wrapper; import com.core.common.BaseRes; import com.core.common.Cools; import com.core.common.DateUtils; import com.core.common.SnowflakeIdWorker; import com.core.common.*; import com.core.exception.CoolException; import com.zy.asrs.entity.*; import com.zy.asrs.entity.param.EmptyPlateOutParam; @@ -1445,13 +1442,13 @@ @Override @Transactional(rollbackFor = Exception.class) public void backLocOperation(String workNo, Long userId) { public R backLocOperation(String workNo, Long userId) { WrkMast wrkMast = wrkMastService.selectById(workNo); if (Cools.isEmpty(wrkMast)) { throw new CoolException(workNo + "工作档不存在"); return R.error(workNo+"工作档不存在"); } if (wrkMast.getWrkSts() != 15) { throw new CoolException("当前任务状态不能执行此操作！"); return R.error("当前任务状态不能执行此操作！"); } Integer ioType = wrkMast.getIoType() - 50; @@ -1463,7 +1460,7 @@ // ioType = 10; // } if (Objects.isNull(wrkMast.getIsSuplus())) { throw new CoolException("回库类型不能为空！！"); return R.error("回库类型不能为空！！"); } if (wrkMast.getIsSuplus() == 0) { @@ -1481,12 +1478,12 @@ .eq("crn_no", locMast1.getCrnNo()); // 堆垛机号 StaDesc staDesc = staDescService.selectOne(wrapper); if (Cools.isEmpty(staDesc)) { throw new CoolException("入库路径不存在"); return R.error("入库路径不存在"); } int count = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("barcode", wrkMast.getBarcode())); if (count >= 2) { throw new CoolException("任务档已生成，不可以重复生成相同的子任务！！"); return R.error("任务档已生成，不可以重复生成相同的子任务！！"); } WrkDetl detl = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo())); @@ -1516,11 +1513,11 @@ mast.setModiTime(now); mast.setModiUser(userId); if (!wrkMastService.insert(mast)) { throw new CoolException("更新工作档数据状态失败"); return R.error("更新工作档数据状态失败"); } List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo())); if (Cools.isEmpty(wrkDetls)) { throw new CoolException("数据错误，任务档明细不存在 ！！"); return R.error("数据错误，任务档明细不存在 ！！"); } // 修改库位状态 Q.拣料/盘点/并板再入库 @@ -1529,14 +1526,14 @@ inLoc.setModiTime(now); inLoc.setModiUser(userId); if (!locMastService.updateById(inLoc)) { throw new CoolException("修改库位状态失败"); return R.error("修改库位状态失败"); } LocAroundBind aroundBind = locAroundBindService.selectOne(new EntityWrapper<LocAroundBind>().eq("b_loc_no", mast.getSourceLocNo())); if (!Objects.isNull(aroundBind)) { aroundBind.setLocType(LocStsType.LOC_STS_TYPE_R.type); if (!locAroundBindService.updateById(aroundBind)) { throw new CoolException("工位状态修改失败！！"); return R.error("工位状态修改失败！！"); } } @@ -1559,7 +1556,7 @@ locMast.setModiTime(now); locMast.setModiUser(userId); if (!locMastService.updateById(locMast)) { throw new CoolException("修改库位状态失败"); return R.error("修改库位状态失败"); } // wrkMast.setWrkCode(null); @@ -1567,6 +1564,10 @@ // if (!wrkMastService.updateById(wrkMast)) { // throw new CoolException("任务档更新失败！！"); // } if (Cools.isEmpty(mast)) { return R.error("没有生成任务"); } return R.ok("生成回库任务成功！！"); }
@@ -123,7 +123,7 @@ // String deToken = Cools.deTokn(token, user.getPassword()); // long timestamp = Long.parseLong(deToken.substring(0, 13)); // 15分钟后过期 if (System.currentTimeMillis() - userLogin.getCreateTime().getTime() > 900000){ if (System.currentTimeMillis() - userLogin.getCreateTime().getTime() > 3600000){ Http.response(response, BaseRes.DENIED); return false; } src/main/webapp/static/js/locAroundBind/locAroundBind.js
@@ -23,9 +23,9 @@ cols: [[ {type: 'checkbox'} , {field: 'id', align: 'center', title: 'ID', hide: true} , {field: 'devId', align: 'center', title: '机台ID', hide: true} , {field: 'devNo', align: 'center', title: '机台号'} , {field: 'devName', align: 'center', title: '设备名称'} , {field: 'devNo$', align: 'center', title: '机台号'} , {field: 'devId', align: 'center', title: '机台ID'} , {field: 'devName', align: 'center', title: '设备名称', hide: true } , {field: 'blocId', align: 'center', title: '库位ID', hide: true} , {field: 'blocNo', align: 'center', title: '工位'} , {field: 'locType$', align: 'center', title: '工位状态'}
