From 37bcc00df41d164024293fd062ba971e7b561108 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=B1=97=E9=9D=92?= Date: Mon, 18 May 2026 15:15:49 +0800 Subject: [PATCH] =?UTF-8?q?=E7=8E=B0=E5=9C=BA=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/InStockinServiceImpl.java | 1 + .../stockindetail/domain/InStockinDetail.java | 2 ++ .../service/impl/MydoJobServiceImpl.java | 16 +++++---- .../mapper/in/InStockinDetailMapper.xml | 2 ++ ruoyi-ui/build/index.js | 35 ------------------- 5 files changed, 14 insertions(+), 42 deletions(-) delete mode 100644 ruoyi-ui/build/index.js diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/service/impl/InStockinServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/service/impl/InStockinServiceImpl.java index 281aa92..81b9263 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/service/impl/InStockinServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/service/impl/InStockinServiceImpl.java @@ -548,6 +548,7 @@ public class InStockinServiceImpl implements IInStockinService basProduct.setProductId(material.getCode()); basProduct.setSpare9(material.getCode()); basProduct.setSpare8(material.getName()); + basProduct.setProductName(material.getName()); basProduct.setSpare4(Convert.toStr(material.getSingleWeight())); basProduct.setQuantity(material.getQuantity()); basProduct.setSpare3(material.getRoute()); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/domain/InStockinDetail.java b/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/domain/InStockinDetail.java index 4f9f5fe..e14ddf9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/domain/InStockinDetail.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/domain/InStockinDetail.java @@ -143,6 +143,8 @@ public class InStockinDetail extends BaseEntity @Excel(name = "毛重") private String spare8; + private String assignedStatus; + private String spare9; private String status; 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 a125925..cf8ebf7 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 @@ -548,10 +548,12 @@ public class MydoJobServiceImpl implements IMydoJobService { log.error("任务不存在"); return AjaxResult.error(jobId+"任务不存在"); } - if ("1".equals(job.getStatus()) || "2".equals(job.getStatus())){ - AjaxResult ajaxResult = iToWcsService.cancelTaskByTaskNo(job); - if(!ajaxResult.isSuccess()){ - return AjaxResult.error(jobId+"任务取消失败"); + if ("1".equals(job.getStatus()) || "2".equals(job.getStatus())) { + if (job.getStatus().equals("2")){ + AjaxResult ajaxResult = iToWcsService.cancelTaskByTaskNo(job); + if (!ajaxResult.isSuccess()) { + return AjaxResult.error(jobId + "任务取消失败"); + } } MydoJobDetail mydoJobDetail = new MydoJobDetail(); mydoJobDetail.setJobId(jobId); @@ -565,7 +567,7 @@ public class MydoJobServiceImpl implements IMydoJobService { basStock.setOutQuantity(String.valueOf(substract)); basStockMapper.updateBasStock(basStock); } - if ("20".equals(job.getInOrOut())|| "21".equals(job.getInOrOut())){ + if ("20".equals(job.getInOrOut()) || "21".equals(job.getInOrOut())) { //修改单据数量 OutStockoutDetail outStockoutDetail = outStockoutDetailService.selectOutStockoutDetailByStockoutDetailId(detail.getInOrOutDId()); if (outStockoutDetail != null) { @@ -591,9 +593,9 @@ public class MydoJobServiceImpl implements IMydoJobService { //删除分配详情 outStockAllotInfoService.deleteInfoByJobId(jobId); - }else { + } else { log.error("任务处理异常"); - return AjaxResult.error(jobId+"任务处理异常"); + return AjaxResult.error(jobId + "任务处理异常"); } } diff --git a/ruoyi-admin/src/main/resources/mapper/in/InStockinDetailMapper.xml b/ruoyi-admin/src/main/resources/mapper/in/InStockinDetailMapper.xml index 1b1a15e..c1ca3fe 100644 --- a/ruoyi-admin/src/main/resources/mapper/in/InStockinDetailMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/in/InStockinDetailMapper.xml @@ -108,6 +108,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and isd.scan_num = #{scanNum} and isd.scan_num_x = #{scanNumX} and isd.scan_num_j = #{scanNumJ} + and isd.assign_num > 0 + and isd.assign_num = 0 diff --git a/ruoyi-ui/build/index.js b/ruoyi-ui/build/index.js deleted file mode 100644 index 0c57de2..0000000 --- a/ruoyi-ui/build/index.js +++ /dev/null @@ -1,35 +0,0 @@ -const { run } = require('runjs') -const chalk = require('chalk') -const config = require('../vue.config.js') -const rawArgv = process.argv.slice(2) -const args = rawArgv.join(' ') - -if (process.env.npm_config_preview || rawArgv.includes('--preview')) { - const report = rawArgv.includes('--report') - - run(`vue-cli-service build ${args}`) - - const port = 9526 - const publicPath = config.publicPath - - var connect = require('connect') - var serveStatic = require('serve-static') - const app = connect() - - app.use( - publicPath, - serveStatic('./dist', { - index: ['index.html', '/'] - }) - ) - - app.listen(port, function () { - console.log(chalk.green(`> Preview at http://localhost:${port}${publicPath}`)) - if (report) { - console.log(chalk.green(`> Report at http://localhost:${port}${publicPath}report.html`)) - } - - }) -} else { - run(`vue-cli-service build ${args}`) -}