lhq/FT541-WMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

现场问题修改

Browse Source
This commit is contained in:
刘汗青
2026-05-18 15:15:49 +08:00
parent 367740c5ab
commit 37bcc00df4
5 changed files with 14 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ruoyi-admin/src/main/java/com/ruoyi/in/stockin/service/impl/InStockinServiceImpl.java
View File

@@ -548,6 +548,7 @@ public class InStockinServiceImpl implements IInStockinService
basProduct.setProductId(material.getCode()); basProduct.setProductId(material.getCode());
basProduct.setSpare9(material.getCode()); basProduct.setSpare9(material.getCode());
basProduct.setSpare8(material.getName()); basProduct.setSpare8(material.getName());
basProduct.setProductName(material.getName());
basProduct.setSpare4(Convert.toStr(material.getSingleWeight())); basProduct.setSpare4(Convert.toStr(material.getSingleWeight()));
basProduct.setQuantity(material.getQuantity()); basProduct.setQuantity(material.getQuantity());
basProduct.setSpare3(material.getRoute()); basProduct.setSpare3(material.getRoute());

2
ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/domain/InStockinDetail.java
View File

@@ -143,6 +143,8 @@ public class InStockinDetail extends BaseEntity
@Excel(name = "毛重") @Excel(name = "毛重")
private String spare8; private String spare8;
private String assignedStatus;
private String spare9; private String spare9;
private String status; private String status;

16
ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java
View File

@@ -548,10 +548,12 @@ public class MydoJobServiceImpl implements IMydoJobService {
log.error("任务不存在"); log.error("任务不存在");
return AjaxResult.error(jobId+"任务不存在"); return AjaxResult.error(jobId+"任务不存在");
} }
if ("1".equals(job.getStatus()) || "2".equals(job.getStatus())){ if ("1".equals(job.getStatus()) || "2".equals(job.getStatus())) {
AjaxResult ajaxResult = iToWcsService.cancelTaskByTaskNo(job); if (job.getStatus().equals("2")){
if(!ajaxResult.isSuccess()){ AjaxResult ajaxResult = iToWcsService.cancelTaskByTaskNo(job);
return AjaxResult.error(jobId+"任务取消失败"); if (!ajaxResult.isSuccess()) {
return AjaxResult.error(jobId + "任务取消失败");
}
} }
MydoJobDetail mydoJobDetail = new MydoJobDetail(); MydoJobDetail mydoJobDetail = new MydoJobDetail();
mydoJobDetail.setJobId(jobId); mydoJobDetail.setJobId(jobId);
@@ -565,7 +567,7 @@ public class MydoJobServiceImpl implements IMydoJobService {
basStock.setOutQuantity(String.valueOf(substract)); basStock.setOutQuantity(String.valueOf(substract));
basStockMapper.updateBasStock(basStock); 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()); OutStockoutDetail outStockoutDetail = outStockoutDetailService.selectOutStockoutDetailByStockoutDetailId(detail.getInOrOutDId());
if (outStockoutDetail != null) { if (outStockoutDetail != null) {
@@ -591,9 +593,9 @@ public class MydoJobServiceImpl implements IMydoJobService {
//删除分配详情 //删除分配详情
outStockAllotInfoService.deleteInfoByJobId(jobId); outStockAllotInfoService.deleteInfoByJobId(jobId);
}else { } else {
log.error("任务处理异常"); log.error("任务处理异常");
return AjaxResult.error(jobId+"任务处理异常"); return AjaxResult.error(jobId + "任务处理异常");
} }
} }

2
ruoyi-admin/src/main/resources/mapper/in/InStockinDetailMapper.xml
View File

@@ -108,6 +108,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="scanNum != null and scanNum != ''"> and isd.scan_num = #{scanNum}</if> <if test="scanNum != null and scanNum != ''"> and isd.scan_num = #{scanNum}</if>
<if test="scanNumX != null and scanNumX != ''"> and isd.scan_num_x = #{scanNumX}</if> <if test="scanNumX != null and scanNumX != ''"> and isd.scan_num_x = #{scanNumX}</if>
<if test="scanNumJ != null and scanNumJ != ''"> and isd.scan_num_j = #{scanNumJ}</if> <if test="scanNumJ != null and scanNumJ != ''"> and isd.scan_num_j = #{scanNumJ}</if>
<if test="assignedStatus != null and assignedStatus == 'assigned'"> and isd.assign_num &gt; 0</if>
<if test="assignedStatus != null and assignedStatus == 'unassigned'"> and isd.assign_num = 0</if>
</where> </where>
</select> </select>

35
ruoyi-ui/build/index.js
View File

@@ -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}`)
}