diff --git a/RuoYi-App-master/manifest.json b/RuoYi-App-master/manifest.json index 0b3a38b..e167926 100644 --- a/RuoYi-App-master/manifest.json +++ b/RuoYi-App-master/manifest.json @@ -1,6 +1,6 @@ { - "name" : "若依移动端", - "appid" : "__UNI__A2DE016", + "name" : "541立库APP", + "appid" : "__UNI__2E13A0F", "description" : "", "versionName" : "1.1.0", "versionCode" : "100", diff --git a/RuoYi-App-master/pages/in/bindManypk.vue b/RuoYi-App-master/pages/in/bindManypk.vue index 01be419..c4a08bb 100644 --- a/RuoYi-App-master/pages/in/bindManypk.vue +++ b/RuoYi-App-master/pages/in/bindManypk.vue @@ -2,89 +2,76 @@ - 托盘条码 - - - + 仓库 + - 物料条码 - + 入库子单 + - - - 仓库 - - + + - - 托盘已绑定物料 - - - - {{ m.productName || '未知物料' }} - × {{ m.quantity }} - - - - - - - 托盘已绑定物料 - 暂无数据 - - - + 物料详情 - 物料名称{{ materialDetail.productName }} - 物料编码{{ materialDetail.productId }} - 可用数量{{ materialDetail.quantity }} - 绑定数量 - + 物料名称 + {{ materialDetail.productName }} + + + 物料编码 + {{ materialDetail.productId }} + + + 可用数量 + {{ materialDetail.quantityX }} + + + 入库数量 + - + - + - - - + + + + + + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWcsServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWcsServiceImpl.java index a5e2032..bc2b1c0 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWcsServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWcsServiceImpl.java @@ -83,6 +83,7 @@ public class ToWcsServiceImpl implements IToWcsService { List roadwayRunningMydoJobs = mydoJobService.selectMydoJobListApi(mydoJobParam); if (CollUtil.isEmpty(roadwayRunningMydoJobs)){ mydoJobParam1.setStatus("1"); + mydoJobParam1.setRoadwayId(String.valueOf(i)); List roadwayWaitingMydoJobs = mydoJobService.selectMydoJobListApi(mydoJobParam1); if (CollUtil.isNotEmpty(roadwayWaitingMydoJobs)){ MydoJob outMydoJob = roadwayWaitingMydoJobs.get(0); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java index f0aa502..5e7a1ff 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java @@ -361,6 +361,8 @@ public class MydoJobServiceImpl implements IMydoJobService { basCargoSpace.setTrayCode(mydoJob.getTrayCode()); basCargoSpace.setCargoSpaceId(mydoJob.getCargoSpaceId()); basCargoSpace.setTheType(mydoJob.getLineId()); + basCargoSpace.setTheTypeName(mydoJob.getWorkshopId()); + basCargoSpaceService.updateBasCargoSpace(basCargoSpace); //插入库存信息 @@ -411,6 +413,8 @@ public class MydoJobServiceImpl implements IMydoJobService { basCargoSpace.setTrayCode(mydoJob.getTrayCode()); basCargoSpace.setCargoSpaceId(mydoJob.getCargoSpaceId()); basCargoSpace.setTheType(mydoJob.getLineId()); + basCargoSpace.setTheTypeName(mydoJob.getWorkshopId()); + basCargoSpaceService.updateBasCargoSpace(basCargoSpace); //插入库存信息 @@ -445,6 +449,7 @@ public class MydoJobServiceImpl implements IMydoJobService { //修改货位状态 basCargoSpace.setStatus("2"); basCargoSpace.setTheType(mydoJob.getLineId()); + basCargoSpace.setTheTypeName(mydoJob.getWorkshopId()); basCargoSpace.setTrayCode(mydoJob.getTrayCode()); basCargoSpace.setCargoSpaceId(mydoJob.getCargoSpaceId()); basCargoSpaceService.updateBasCargoSpace(basCargoSpace); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/out/handAllotStock/domain/ViewHandAllotStock.java b/ruoyi-admin/src/main/java/com/ruoyi/out/handAllotStock/domain/ViewHandAllotStock.java index 7fe61a2..380f9bf 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/out/handAllotStock/domain/ViewHandAllotStock.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/out/handAllotStock/domain/ViewHandAllotStock.java @@ -169,6 +169,25 @@ public class ViewHandAllotStock extends BaseEntity private String theColumn; private String theFloor; + private String theType; + private String theTypeName; + + public String getTheType() { + return theType; + } + + public void setTheType(String theType) { + this.theType = theType; + } + + public String getTheTypeName() { + return theTypeName; + } + + public void setTheTypeName(String theTypeName) { + this.theTypeName = theTypeName; + } + public String getRoadwayId() { return roadwayId; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/pda/domain/TrayCodeMsg.java b/ruoyi-admin/src/main/java/com/ruoyi/pda/domain/TrayCodeMsg.java index ef453f3..bd6d8aa 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/pda/domain/TrayCodeMsg.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/pda/domain/TrayCodeMsg.java @@ -2,22 +2,33 @@ package com.ruoyi.pda.domain; public class TrayCodeMsg { -private String trayCode; + private String trayCode; -private String warehouseId; + private String warehouseId; -private String inQuantity; + private String inQuantity; -private String entranceId; + private String entranceId; -private String cargoSpaceId; + private String cargoSpaceId; -private String exitId; + private String exitId; -private String stockinDetailId; + private String stockinDetailId; -private String inOut; -private String status; + private String inOut; + private String status; + + //容量 + private String workshopId; + + public String getWorkshopId() { + return workshopId; + } + + public void setWorkshopId(String workshopId) { + this.workshopId = workshopId; + } public String getStatus() { return status; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java b/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java index 7d938e3..e43ab48 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java @@ -208,6 +208,7 @@ public class PdaServiceImp implements PdaService { HashMap map = new HashMap<>(); map.put("v_tray_code", trayCodeMsg.getTrayCode()); map.put("v_dept_id", SecurityUtils.getDeptId().toString()); + map.put("v_workshop_id", trayCodeMsg.getWorkshopId()); map.put("v_warehouse_id", trayCodeMsg.getWarehouseId()); pdaMapper.rkSure(map); String result = map.get("v_result").toString(); @@ -222,12 +223,13 @@ public class PdaServiceImp implements PdaService { @Override public AjaxResult rkSurepk(TrayCodeMsg trayCodeMsg) { HashMap map = new HashMap<>(); - map.put("v_tray_code", trayCodeMsg.getTrayCode()); + map.put("v_dept_id", SecurityUtils.getDeptId().toString()); map.put("v_warehouse_id", trayCodeMsg.getWarehouseId()); - pdaMapper.rkSure(map); - AjaxResult ajaxResult = mydoJobService.manualCompleted(mydoJobService.selectMydoJobByTrayCode(trayCodeMsg.getTrayCode()), 1); + map.put("v_in_stock_detail_id", trayCodeMsg.getStockinDetailId()); + map.put("v_in_quantity", trayCodeMsg.getInQuantity()); + pdaMapper.pkIn(map); - return ajaxResult; + return AjaxResult.success(); } @Override diff --git a/ruoyi-admin/src/main/java/com/ruoyi/stock/freeze/service/impl/BasStockFreezeRecordServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/stock/freeze/service/impl/BasStockFreezeRecordServiceImpl.java index ba8d519..195819f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/stock/freeze/service/impl/BasStockFreezeRecordServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/stock/freeze/service/impl/BasStockFreezeRecordServiceImpl.java @@ -3,6 +3,7 @@ package com.ruoyi.stock.freeze.service.impl; import cn.hutool.core.util.IdUtil; import com.ruoyi.common.annotation.DataScope; import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.stock.freeze.domain.BasStockFreezeRecord; import com.ruoyi.stock.freeze.mapper.BasStockFreezeRecordMapper; import com.ruoyi.stock.freeze.service.IBasStockFreezeRecordService; @@ -45,6 +46,7 @@ public class BasStockFreezeRecordServiceImpl implements IBasStockFreezeRecordSer //@DataScope(warehouseAlias = "bw") public List selectBasStockFreezeRecordList(BasStockFreezeRecord basStockFreezeRecord) { + basStockFreezeRecord.setPrintDate(SecurityUtils.getDeptId().toString()); return basStockFreezeRecordMapper.selectBasStockFreezeRecordList(basStockFreezeRecord); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/stock/maintain/service/impl/BasStockMaintainRecordServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/stock/maintain/service/impl/BasStockMaintainRecordServiceImpl.java index 73bf72c..96494d8 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/stock/maintain/service/impl/BasStockMaintainRecordServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/stock/maintain/service/impl/BasStockMaintainRecordServiceImpl.java @@ -2,6 +2,7 @@ package com.ruoyi.stock.maintain.service.impl; import com.ruoyi.common.annotation.DataScope; import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.stock.maintain.domain.BasStockMaintainRecord; import com.ruoyi.stock.maintain.mapper.BasStockMaintainRecordMapper; import com.ruoyi.stock.maintain.service.IBasStockMaintainRecordService; @@ -44,6 +45,7 @@ public class BasStockMaintainRecordServiceImpl implements IBasStockMaintainRecor //@DataScope(warehouseAlias = "bw") public List selectBasStockMaintainRecordList(BasStockMaintainRecord basStockMaintainRecord) { + basStockMaintainRecord.setPrintDate(SecurityUtils.getDeptId().toString()); return basStockMaintainRecordMapper.selectBasStockMaintainRecordList(basStockMaintainRecord); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/domain/BasStock.java b/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/domain/BasStock.java index d885ef5..d37748a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/domain/BasStock.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/domain/BasStock.java @@ -217,4 +217,6 @@ public class BasStock extends BaseEntity { private String cargoNo; @Excel(name = "备注",sort=31) private String remark; + + private List warehouseIdList; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/service/impl/BasStockServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/service/impl/BasStockServiceImpl.java index 52a776d..240a124 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/service/impl/BasStockServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/stock/stock/service/impl/BasStockServiceImpl.java @@ -119,7 +119,7 @@ public class BasStockServiceImpl implements IBasStockService } private void insertMaintainRecord(BasStock oldStock, BasStock basStock, String operate) { - if (oldStock != null && (!oldStock.getQuantity().equals(basStock.getQuantity())||!oldStock.getProductId().equals(basStock.getProductId()))) { + if ("2".equals(operate) && oldStock != null && (!oldStock.getQuantity().equals(basStock.getQuantity())||!oldStock.getProductId().equals(basStock.getProductId()))) { BasStockMaintainRecord basStockMaintainRecord = new BasStockMaintainRecord(); basStockMaintainRecord.setWhGuid(IdUtil.fastSimpleUUID()); basStockMaintainRecord.setStockId(basStock.getStockId()); @@ -135,6 +135,45 @@ public class BasStockServiceImpl implements IBasStockService basStockMaintainRecord.setProductName(basStock.getProductName()); basStockMaintainRecord.setWarehouseId(basStock.getWarehouseId()); basStockMaintainRecord.setMethod(operate); + basStockMaintainRecord.setPrintDate(SecurityUtils.getDeptId().toString()); + basStockMaintainRecordService.insertBasStockMaintainRecord(basStockMaintainRecord); + } + if ("1".equals(operate)){ + BasStockMaintainRecord basStockMaintainRecord = new BasStockMaintainRecord(); + basStockMaintainRecord.setWhGuid(IdUtil.fastSimpleUUID()); + basStockMaintainRecord.setStockId(basStock.getStockId()); + basStockMaintainRecord.setCargoSpaceId(basStock.getCargoSpaceId()); + basStockMaintainRecord.setLotNo(""); + basStockMaintainRecord.setTrayCode(basStock.getTrayCode()); + basStockMaintainRecord.setProductGuid(basStock.getProductGuid()); + basStockMaintainRecord.setCreateBy(SecurityUtils.getLoginUser().getUsername()); + basStockMaintainRecord.setCreateTime(new Date()); + basStockMaintainRecord.setOldQuantity("0"); + basStockMaintainRecord.setQuantity(basStock.getQuantity()); + basStockMaintainRecord.setProductId(basStock.getProductId()); + basStockMaintainRecord.setProductName(basStock.getProductName()); + basStockMaintainRecord.setWarehouseId(basStock.getWarehouseId()); + basStockMaintainRecord.setMethod(operate); + basStockMaintainRecord.setPrintDate(SecurityUtils.getDeptId().toString()); + basStockMaintainRecordService.insertBasStockMaintainRecord(basStockMaintainRecord); + } + if ("3".equals(operate)){ + BasStockMaintainRecord basStockMaintainRecord = new BasStockMaintainRecord(); + basStockMaintainRecord.setWhGuid(IdUtil.fastSimpleUUID()); + basStockMaintainRecord.setStockId(basStock.getStockId()); + basStockMaintainRecord.setCargoSpaceId(basStock.getCargoSpaceId()); + basStockMaintainRecord.setLotNo(""); + basStockMaintainRecord.setTrayCode(basStock.getTrayCode()); + basStockMaintainRecord.setProductGuid(basStock.getProductGuid()); + basStockMaintainRecord.setCreateBy(SecurityUtils.getLoginUser().getUsername()); + basStockMaintainRecord.setCreateTime(new Date()); + basStockMaintainRecord.setOldQuantity(basStock.getQuantity()); + basStockMaintainRecord.setQuantity("0"); + basStockMaintainRecord.setProductId(basStock.getProductId()); + basStockMaintainRecord.setProductName(basStock.getProductName()); + basStockMaintainRecord.setWarehouseId(basStock.getWarehouseId()); + basStockMaintainRecord.setMethod(operate); + basStockMaintainRecord.setPrintDate(SecurityUtils.getDeptId().toString()); basStockMaintainRecordService.insertBasStockMaintainRecord(basStockMaintainRecord); } } @@ -182,6 +221,7 @@ public class BasStockServiceImpl implements IBasStockService basStockFreezeRecord.setOldStatus(oldBasStock.getStockStatus()); basStockFreezeRecord.setCurrStatus(basStock.getStockStatus()); basStockFreezeRecord.setWarehouseId(basStock.getWarehouseId()); + basStockFreezeRecord.setPrintDate(SecurityUtils.getDeptId().toString()); if ("1".equals(basStock.getStockStatus())){ basStockFreezeRecord.setMethod("解冻"); }else { @@ -261,32 +301,37 @@ public class BasStockServiceImpl implements IBasStockService @Override public List selectBasStockSummary(BasStock basStock) { if (!"admin".equals(SecurityUtils.getUsername())){ - basStock.setModel(SecurityUtils.getDeptId().toString()); List roles = SecurityUtils.getLoginUser().getUser().getRoles(); if (CollUtil.isEmpty(roles)) { //如果未设置角色 ，直接返回空列表 return new ArrayList<>(); } + ArrayList warehouseIdList = new ArrayList<>(); Optional first = roles.stream().filter(x -> "role1".equals(x.getRoleKey())).findFirst(); if (first.isPresent()){ //二联合普通人员 - basStock.setWarehouseId("02"); + basStock.setModel(SecurityUtils.getDeptId().toString()); + warehouseIdList.add("02"); + warehouseIdList.add("03"); } Optional first1 = roles.stream().filter(x -> "role2".equals(x.getRoleKey())).findFirst(); if (first1.isPresent()){ //三联合普通人员 - basStock.setWarehouseId("01"); + basStock.setModel(SecurityUtils.getDeptId().toString()); + warehouseIdList.add("01"); } Optional first2 = roles.stream().filter(x -> "role3".equals(x.getRoleKey())).findFirst(); if (first2.isPresent()){ //二联合管理员 - basStock.setWarehouseId("02"); + warehouseIdList.add("02"); + warehouseIdList.add("03"); } Optional first3 = roles.stream().filter(x -> "role4".equals(x.getRoleKey())).findFirst(); if (first3.isPresent()){ //三联合管理员 - basStock.setWarehouseId("01"); + warehouseIdList.add("01"); } + basStock.setWarehouseIdList(warehouseIdList); } return basStockMapper.selectBasStockSummary(basStock); } diff --git a/ruoyi-admin/src/main/resources/mapper/out/ViewHandAllotStockMapper.xml b/ruoyi-admin/src/main/resources/mapper/out/ViewHandAllotStockMapper.xml index 5ada1e4..2a7bede 100644 --- a/ruoyi-admin/src/main/resources/mapper/out/ViewHandAllotStockMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/out/ViewHandAllotStockMapper.xml @@ -46,13 +46,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + select stock_id, cargo_space_id, stock_status, product_status, lot_no, in_date, back_date, product_guid, quantity, job_id, tray_code, out_quantity, stockin_detail_id, stockin_id, in_type, in_class_id, warehouse_id, stacking_id, spare1, spare2, spare3, spare4, spare5, spare6, product_id, product_name, voltage, power, phase, net_weight, gross_weight, distribution, model, order_id, spare7, spare8, cargo_space_name,roadway_id, the_platoon, the_column, - the_floor from view_hand_allot_stock vhat + the_floor, + the_type, + the_type_name from view_hand_allot_stock vhat diff --git a/ruoyi-ui/src/api/rf/rf.js b/ruoyi-ui/src/api/rf/rf.js index 8bf9f21..b20fa24 100644 --- a/ruoyi-ui/src/api/rf/rf.js +++ b/ruoyi-ui/src/api/rf/rf.js @@ -25,6 +25,13 @@ export function addInJob(data) { data: data }) } +export function rkSurepk(data) { + return request({ + url: '/pda/rkSurepk', + method: 'post', + data: data + }) +} // 根据托盘条码获取物料信息 export function getTaskDetail(data) { diff --git a/ruoyi-ui/src/views/in/job/index.vue b/ruoyi-ui/src/views/in/job/index.vue index a7e13a6..fbbfa81 100644 --- a/ruoyi-ui/src/views/in/job/index.vue +++ b/ruoyi-ui/src/views/in/job/index.vue @@ -86,6 +86,16 @@ v-hasPermi="['job:mydoJob:manualCompleted']" >手动完成 + + 修改托盘码 + @@ -106,6 +116,8 @@ + + @@ -176,6 +188,24 @@ @pagination="getDetailList" /> + + + + + + + + + + + + +
+ 确 定 + 取 消 +
+ + @@ -258,8 +288,12 @@ export default { pageNum: 1, pageSize: 99, }, - // 表单参数 form: {}, + rules: { + trayCode: [ + { required: true, message: "托盘码不能为空", trigger: "blur" } + ] + }, } }, created() { @@ -394,6 +428,37 @@ export default { } }, + openEditTrayDialog() { + if (this.ids.length === 0) { + this.$modal.msgError("请选择要修改的任务"); + return; + } + if (this.ids.length > 1) { + this.$modal.msgError("一次只能修改一条任务"); + return; + } + const jobId = this.ids[0]; + const row = this.mydoJobList.find(item => item.jobId === jobId); + if (!row) { + this.$modal.msgError("未找到选中任务数据"); + return; + } + this.form = Object.assign({}, row); + this.title = "修改任务托盘码"; + this.open = true; + }, + submitForm() { + this.$refs["form"].validate(valid => { + if (!valid) { + return; + } + updateMydoJob(this.form).then(() => { + this.$modal.msgSuccess("修改成功"); + this.open = false; + this.getList(); + }); + }); + }, /** 导出按钮操作 */ handleExport() { this.download('job/mydoJob/export', { diff --git a/ruoyi-ui/src/views/rf/bindTraycode.vue b/ruoyi-ui/src/views/rf/bindTraycode.vue index bfe57d7..41217b7 100644 --- a/ruoyi-ui/src/views/rf/bindTraycode.vue +++ b/ruoyi-ui/src/views/rf/bindTraycode.vue @@ -28,6 +28,15 @@ > + + + + - - - - - -
托盘已绑定物料
- - - - - - - - - 确认入库 - 重置 - + + + @@ -77,7 +55,7 @@