root/wuHanXinRui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

代码更新

Browse Source
This commit is contained in:
liuxy
2022-07-04 15:30:34 +08:00
parent 17c010f0b7
commit 260561a4ac
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FlourworkServiceImpl.java
View File

@@ -180,7 +180,8 @@ public class FlourworkServiceImpl implements FlourworkService {
WQLObject devicePointTab = WQLObject.getWQLObject("SCH_BASE_DevicePointPara"); // 设备点位参数表 WQLObject devicePointTab = WQLObject.getWQLObject("SCH_BASE_DevicePointPara"); // 设备点位参数表
WQLObject strucTab = WQLObject.getWQLObject("st_ivt_structattr"); // 仓位表 WQLObject strucTab = WQLObject.getWQLObject("st_ivt_structattr"); // 仓位表
JSONObject jsonFormMst = formTabMst.query("formula_id = '" + formula_id + "'").uniqueResult(0); JSONObject jsonFormMst = formTabMst.query("formula_id = '" + formula_id + "' and status <> '99'").uniqueResult(0);
if (ObjectUtil.isEmpty(jsonFormMst)) throw new BadRequestException("配方已完成");
/* /*
* 查询需要移库的物料（配方明细表）条件： * 查询需要移库的物料（配方明细表）条件：
* 1.状态等于10生成、20生产中 * 1.状态等于10生成、20生产中

3
mes/qd/src/views/wms/pf/flourwork/WorkDialog.vue
View File

@@ -365,9 +365,6 @@ export default {
'device_id': this.form.device_id, 'device_id': this.form.device_id,
'formula_id': this.form.formula_id 'formula_id': this.form.formula_id
} }
if (this.form.status !== '30') {
return this.crud.notify('配方状态必须为生产中', CRUD.NOTIFICATION_TYPE.INFO)
}
this.fla = true this.fla = true
crudFlourwork.autoCalledMater(data).then(res => { crudFlourwork.autoCalledMater(data).then(res => {
const num = res.task const num = res.task