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

修改

Browse Source
This commit is contained in:
ZHOUZ\Noble'lift
2022-07-21 15:06:13 +08:00
parent 61f6311a05
commit 3c23807c4f
3 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mes/hd/nladmin-system/src/main/java/org/nl/ext/erp/service/impl/WmsToErpServiceImpl.java
View File

@@ -400,7 +400,7 @@ public class WmsToErpServiceImpl implements WmsToErpService {
whereMap = new HashMap<String, String>(map); whereMap = new HashMap<String, String>(map);
} }
JSONArray ja = WQL.getWO("QERP").setDbname("dataSource1").addParamMap(whereMap).addParam("flag", "4").process().getResultJSONArray(0); JSONArray ja = WQL.getWO("QERP").setDbname("dataSource1").addParamMap(whereMap).addParam("flag", "5").process().getResultJSONArray(0);
log.info("备件入库单导入数据---------:" + ja.toString()); log.info("备件入库单导入数据---------:" + ja.toString());
for (int i = 0; i < ja.size(); i++) { for (int i = 0; i < ja.size(); i++) {
@@ -409,6 +409,7 @@ public class WmsToErpServiceImpl implements WmsToErpService {
JSONObject purchase = purchaseIn_wql.query("CGENERALBID = '"+CGENERALBID+"'").uniqueResult(0); JSONObject purchase = purchaseIn_wql.query("CGENERALBID = '"+CGENERALBID+"'").uniqueResult(0);
if (ObjectUtil.isEmpty(purchase)){ if (ObjectUtil.isEmpty(purchase)){
purchase = new JSONObject(); purchase = new JSONObject();
purchase.put("id", IdUtil.getSnowflake(1, 1).nextId());
purchase.put("CGENERALHID",jo.getString("CGENERALHID")); purchase.put("CGENERALHID",jo.getString("CGENERALHID"));
purchase.put("CGENERALBID",jo.getString("CGENERALBID")); purchase.put("CGENERALBID",jo.getString("CGENERALBID"));
purchase.put("CROWNO",jo.getString("CROWNO")); purchase.put("CROWNO",jo.getString("CROWNO"));

4
mes/qd/src/views/wms/sb/inbill/DivDialog.vue
View File

@@ -237,10 +237,6 @@ export default {
}, },
clcikRow(row, column, event) { clcikRow(row, column, event) {
this.form.dtl_row = row this.form.dtl_row = row
sparePart.getIODtl({ 'bill_code': this.form.dtl_row.bill_code }).then(res => {
this.openParam = res
this.form.dtl_row = res[row.index]
})
sparePart.getDisDtl(row).then(res => { sparePart.getDisDtl(row).then(res => {
this.form.tableMater = res this.form.tableMater = res
}) })

1
mes/qd/src/views/wms/sb/inbill/ViewDialog.vue
View File

@@ -239,7 +239,6 @@ export default {
return this.dict.label.work_status[row.work_status] return this.dict.label.work_status[row.work_status]
}, },
handleDtlCurrentChange(current) { handleDtlCurrentChange(current) {
debugger
if (current !== null) { if (current !== null) {
this.tabledis = [] this.tabledis = []
this.currentdtl = current this.currentdtl = current