From f60fa19136bb4b71159648ae4487c881b904a534 Mon Sep 17 00:00:00 2001 From: liuhanqing Date: Thu, 23 Oct 2025 15:40:25 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=98=E7=82=B9=E5=85=A5=E5=BA=93=E5=87=BA?= =?UTF-8?q?=E5=BA=93=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/MydoJobServiceImpl.java | 15 +++++++++------ .../com/ruoyi/pda/service/PdaServiceImp.java | 17 +++++++++-------- .../check/CheckDifferenceRecordMapper.xml | 7 ------- .../mapper/in/InStockinDetailFinishMapper.xml | 4 ++-- .../mapper/in/InStockinDetailMapper.xml | 4 ++-- .../resources/mapper/stock/BasStockMapper.xml | 4 ++-- ruoyi-ui/src/views/check/job/in/index.vue | 4 ++-- ruoyi-ui/src/views/check/job/out/index.vue | 3 ++- 8 files changed, 28 insertions(+), 30 deletions(-) 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 6bba7d8..b3ce2e3 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 @@ -275,6 +275,7 @@ public class MydoJobServiceImpl implements IMydoJobService { BasStock stockByInStockinDetail = getStockByInStockinDetail(mydoJobDetail, mydoJob, "2"); stockByInStockinDetail.setSpare7("1"); stockByInStockinDetail.setBackDate(DateUtil.formatDateTime(DateUtil.date())); + stockByInStockinDetail.setInDate(mydoJobDetail.getInDate()); list.add(stockByInStockinDetail); //修改异常记录中的库存id CheckDifferenceRecord checkDifferenceRecord = first.get(); @@ -319,12 +320,14 @@ public class MydoJobServiceImpl implements IMydoJobService { if (CollUtil.isNotEmpty(mydoJobDetails)) { List list = new ArrayList<>(); for (MydoJobDetail mydoJobDetail : mydoJobDetails) { - //if ("2".equals(mydoJob.getInOrOut()) || "3".equals(mydoJob.getInOrOut())) { - //修改单据实际数量 - String inOrOutDId = mydoJobDetail.getInOrOutDId(); - InStockinDetail inStockinDetail = inStockinDetailService.selectInStockinDetailByStockinDetailId(inOrOutDId); - inStockinDetail.setAssignNum(Convert.toStr(Convert.toBigDecimal(inStockinDetail.getAssignNum()).add(Convert.toBigDecimal(mydoJobDetail.getInQuantity())))); - inStockinDetailService.updateInStockinDetail(inStockinDetail); + if ("1".equals(mydoJob.getInOrOut()) ) { + //修改单据实际数量 + String inOrOutDId = mydoJobDetail.getInOrOutDId(); + InStockinDetail inStockinDetail = inStockinDetailService.selectInStockinDetailByStockinDetailId(inOrOutDId); + inStockinDetail.setAssignNum(Convert.toStr(Convert.toBigDecimal(inStockinDetail.getAssignNum()).add(Convert.toBigDecimal(mydoJobDetail.getInQuantity())))); + inStockinDetailService.updateInStockinDetail(inStockinDetail); + } + //} //正常库存 BasStock stockByInStockinDetail = getStockByInStockinDetail(mydoJobDetail, mydoJob, "1"); 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 a88b9e6..6641ecd 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 @@ -116,11 +116,12 @@ public class PdaServiceImp implements PdaService { //@Transactional(rollbackFor = Exception.class) public AjaxResult checkMakeSure(TrayCodeMakeSure trayCodeMakeSure) { - MydoJob mydoJob = new MydoJob(); - mydoJob.setExitId(trayCodeMakeSure.getExitId()); - mydoJob.setStatus("3"); - mydoJob.setInOrOut("26"); - List mydoJobDetails = mydoJobDetailService.selectPdMydoJobDetailListByExit(mydoJob); + MydoJob mydoJob = mydoJobService.selectMydoJobByTrayCode(trayCodeMakeSure.getTrayCode()); + if (mydoJob == null){ + return AjaxResult.error("该托盘没有盘点作业，请检查"); + } + + List mydoJobDetails = mydoJobDetailService.selectMydoJobDetailListByJobId(mydoJob.getJobId()); if(mydoJobDetails.isEmpty()){ return AjaxResult.error("该物料没有盘点出库作业，请检查"); } @@ -129,13 +130,13 @@ public class PdaServiceImp implements PdaService { if (CollUtil.isNotEmpty(mydoJobDetailList)) { boolean flag = mydoJobDetailList.stream().anyMatch(x -> StrUtil.isEmpty(x.getStockId()) && "0".equals(x.getInQuantity())); if (flag) { - return AjaxResult.warn(MessageUtils.message("warn.message8")); + return AjaxResult.warn("新增物料数量不能为空！"); } for (MydoJobDetail mydoJobDetail : mydoJobDetailList) { //插入盘点提交表 CheckCommitRecord checkCommitRecord = new CheckCommitRecord(); checkCommitRecord.setQuantity(mydoJobDetail.getInQuantity()); - checkCommitRecord.setTrayCode(mydoJobDetails.get(0).getTrayCode()); + checkCommitRecord.setTrayCode(mydoJob.getTrayCode()); checkCommitRecord.setStockId(mydoJobDetail.getStockId()); checkCommitRecord.setSpare1(mydoJobDetail.getInOrOutDId()); checkCommitRecord.setSpare2(mydoJobDetail.getProductId()); @@ -145,7 +146,7 @@ public class PdaServiceImp implements PdaService { } } HashMap map = new HashMap<>(); - map.put("v_tray_code", mydoJobDetails.get(0).getTrayCode()); + map.put("v_tray_code", mydoJob.getTrayCode()); pdaMapper.checkMakeSure(map); //iToWcsService.pushInMydoJob(); String result = map.get("v_result").toString(); diff --git a/ruoyi-admin/src/main/resources/mapper/check/CheckDifferenceRecordMapper.xml b/ruoyi-admin/src/main/resources/mapper/check/CheckDifferenceRecordMapper.xml index 29b0b26..a30b353 100644 --- a/ruoyi-admin/src/main/resources/mapper/check/CheckDifferenceRecordMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/check/CheckDifferenceRecordMapper.xml @@ -25,13 +25,6 @@ - - - - - - - diff --git a/ruoyi-admin/src/main/resources/mapper/in/InStockinDetailFinishMapper.xml b/ruoyi-admin/src/main/resources/mapper/in/InStockinDetailFinishMapper.xml index 818dda7..784cc4c 100644 --- a/ruoyi-admin/src/main/resources/mapper/in/InStockinDetailFinishMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/in/InStockinDetailFinishMapper.xml @@ -91,9 +91,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select isd.stockin_detail_id, isd.stockin_guid, isd.stockin_id, isd.lot_no, isd.product_guid, - isd.product_id, isd.quantity, isd.quantity_x, isd.quantity_j, isd.price, isd.cargo_no, isd.remark, + isd.product_id, isd.quantity, isd.quantity_x, isd.quantity_j, isd.price, bp.cargo_no, isd.remark, isd.assign_num, isd.assign_num_x, isd.assign_num_j, isd.print_date, isd.stock_status, - isd.supplier_id, isd.customer_id, isd.unit, isd.spec, isd.spare1, isd.spare2, isd.spare3, isd.spare4, + isd.supplier_id, isd.customer_id, bp.unit, bp.spec, isd.spare1, isd.spare2, isd.spare3, isd.spare4, isd.spare5, isd.spare6, isd.scan_num, isd.scan_num_x, isd.scan_num_j, bp.product_name, isd.spare7,isd.spare8,isd.spare9,bs.supplier_name diff --git a/ruoyi-admin/src/main/resources/mapper/in/InStockinDetailMapper.xml b/ruoyi-admin/src/main/resources/mapper/in/InStockinDetailMapper.xml index 5797f3c..57deda7 100644 --- a/ruoyi-admin/src/main/resources/mapper/in/InStockinDetailMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/in/InStockinDetailMapper.xml @@ -57,9 +57,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select isd.stockin_detail_id, isd.stockin_guid, isd.stockin_id, isd.lot_no, isd.product_guid, - isd.product_id, isd.quantity, isd.quantity_x, isd.quantity_j, isd.price, isd.cargo_no, isd.remark, + isd.product_id, isd.quantity, isd.quantity_x, isd.quantity_j, isd.price, bp.cargo_no, isd.remark, isd.assign_num, isd.assign_num_x, isd.assign_num_j, isd.print_date, isd.stock_status, - isd.supplier_id, isd.customer_id, isd.unit, isd.spec, isd.spare1, isd.spare2, isd.spare3, isd.spare4, + isd.supplier_id, isd.customer_id, bp.unit, bp.spec, isd.spare1, isd.spare2, isd.spare3, isd.spare4, isd.spare5, isd.spare6, isd.scan_num, isd.scan_num_x, isd.scan_num_j, bp.product_name, isd.spare7,isd.spare8,isd.spare9,bs.supplier_name diff --git a/ruoyi-admin/src/main/resources/mapper/stock/BasStockMapper.xml b/ruoyi-admin/src/main/resources/mapper/stock/BasStockMapper.xml index 68bb4d3..2c55e71 100644 --- a/ruoyi-admin/src/main/resources/mapper/stock/BasStockMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/stock/BasStockMapper.xml @@ -218,11 +218,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" INSERT INTO bas_stock - (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) + (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) VALUES (#{item.stockId},#{item.cargoSpaceId},#{item.stockStatus},#{item.productStatus},#{item.lotNo},#{item.inDate},#{item.backDate},#{item.productGuid},#{item.quantity},#{item.jobId},#{item.trayCode},#{item.outQuantity},#{item.stockinDetailId},#{item.stockinId},#{item.inType},#{item.inClassId},#{item.warehouseId},#{item.stackingId},#{item.spare1},#{item.spare2},#{item.spare3},#{item.spare4},#{item.spare5},#{item.spare6},#{item.productId} - ,#{item.productName},#{item.voltage},#{item.power},#{item.phase},#{item.netWeight},#{item.grossWeight},#{item.distribution},#{item.model},#{item.orderId},#{item.spare7}) + ,#{item.productName},#{item.voltage},#{item.power},#{item.phase},#{item.netWeight},#{item.grossWeight},#{item.distribution},#{item.model},#{item.orderId},#{item.spare7},#{item.spare8}) diff --git a/ruoyi-ui/src/views/check/job/in/index.vue b/ruoyi-ui/src/views/check/job/in/index.vue index e01239a..6265ff7 100644 --- a/ruoyi-ui/src/views/check/job/in/index.vue +++ b/ruoyi-ui/src/views/check/job/in/index.vue @@ -250,7 +250,7 @@ import {listWarehouse} from "@/api/bas/warehouse"; export default { name: "MydoJob", - dicts: ['execution_phase_type', 'check_in_job_type', 'on_line_type', 'mydo_job_status'], + dicts: ['execution_phase_type', 'check_in_job_type', 'on_line_type', 'mydo_job_status', 'sys_yes_no', 'product_type', 'quality_type', 'turnover_type', 'sys_yes_no', 'account_type', 'origin_type', 'purpose_type',], data() { return { warehouseOptions:[], @@ -456,7 +456,7 @@ export default { }else if (row.type === 'completed'){ //手动完成 manualCompleted(data).then(response => { - this.$modal.msgSuccess(this.$t('checkJobIn.operaSuccess')); + this.$modal.msgSuccess('操作成功'); this.getList(); }) } diff --git a/ruoyi-ui/src/views/check/job/out/index.vue b/ruoyi-ui/src/views/check/job/out/index.vue index 88aaa0f..f49f451 100644 --- a/ruoyi-ui/src/views/check/job/out/index.vue +++ b/ruoyi-ui/src/views/check/job/out/index.vue @@ -144,7 +144,7 @@ - +