diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/set/service/impl/PdaBucketServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/set/service/impl/PdaBucketServiceImpl.java index 92d3c659..6d3bddd1 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/set/service/impl/PdaBucketServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/set/service/impl/PdaBucketServiceImpl.java @@ -156,6 +156,20 @@ public class PdaBucketServiceImpl implements PdaBucketService { //2.假如桶码没有就插入，有就更新 桶记录表 JSONObject bucketJo = new JSONObject(); if (StrUtil.isNotEmpty(bucketunique)) { + // 校验此桶是否有未完成的单据 + JSONObject map = new JSONObject(); + map.put("flag", "16"); + map.put("bucketunique", bucketunique); + JSONArray iosList = WQL.getWO("QPADSTSETSERVICE").addParamMap(map).process().getResultJSONArray(0); + + if (ObjectUtil.isNotEmpty(iosList)) { + boolean is_emp = iosList.stream() + .map(row -> (JSONObject) row) + .allMatch(row -> row.getString("is_active").equals(is_active)); + + if (!is_emp) throw new PdaRequestException("此桶库存是否可用与选择是否可用不一致"+bucketunique+"!"); + } + bucketJo = bucketRecordTable.query("bucketunique='" + bucketunique + "'").uniqueResult(0); String before_storage_qty = bucketJo.getString("storage_qty"); bucketJo.put("storagevehicle_type", "04"); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/set/wql/QPADSTSETSERVICE.wql b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/set/wql/QPADSTSETSERVICE.wql index 2fe11568..6a6de55a 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/set/wql/QPADSTSETSERVICE.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/set/wql/QPADSTSETSERVICE.wql @@ -478,3 +478,20 @@ ENDSELECT ENDQUERY ENDIF + + IF 输入.flag = "16" + QUERY + SELECT + dis.* + FROM + st_ivt_iostorinvdisdtl dis + LEFT JOIN ST_IVT_IOStorInv mst ON mst.iostorinv_id = dis.iostorinv_id + WHERE + mst.io_type = '0' + + OPTION 输入.bucketunique <> "" + dis.bucketunique = 输入.bucketunique + ENDOPTION + ENDSELECT + ENDQUERY + ENDIF diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/pdm/service/impl/WasteBallTimeServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/pdm/service/impl/WasteBallTimeServiceImpl.java index c6b9fbe7..401a7d21 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/pdm/service/impl/WasteBallTimeServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/pdm/service/impl/WasteBallTimeServiceImpl.java @@ -16,6 +16,7 @@ import org.apache.commons.lang3.StringUtils; import org.nl.modules.system.domain.DictDetail; import org.nl.modules.system.repository.DictDetailRepository; import org.nl.utils.SecurityUtils; +import org.nl.utils.SpringContextHolder; import org.nl.wms.basedata.master.constant.MaterOptTypeEnum; import org.nl.wms.basedata.pdm.service.WasteBallTimeService; import org.nl.wms.basedata.pdm.service.dto.WastecchangeDto; @@ -56,7 +57,7 @@ public class WasteBallTimeServiceImpl implements WasteBallTimeService { map.put("material_code", "%" + material_code + "%"); } map.put("class_ids", MaterOptTypeEnum.THW.getClass_idStr()); - List rfType = dictDetailRepository.findByDictName("MD_MATERIAL_WASTE_TYPE"); + List rfType = SpringContextHolder.getBean(DictDetailRepository.class).findByDictName("MD_MATERIAL_WASTE_TYPE"); Map typeMap = rfType.stream().collect(HashMap::new, (k, v) -> k.put(v.getValue(), v.getLabel()), HashMap::putAll); JSONObject allmaterialIds = WQL.getWO("PDM_WASTEBALLTIME").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "mater.material_code"); @@ -129,7 +130,7 @@ public class WasteBallTimeServiceImpl implements WasteBallTimeService { @Override @Transactional(rollbackFor = Exception.class) public void update(JSONObject form) { - List rfType = dictDetailRepository.findByDictName("MD_MATERIAL_WASTE_TYPE").stream().map(DictDetail::getValue).collect(Collectors.toList()); + List rfType = SpringContextHolder.getBean(DictDetailRepository.class).findByDictName("MD_MATERIAL_WASTE_TYPE").stream().map(DictDetail::getValue).collect(Collectors.toList()); JSONObject allData = new JSONObject(); for (String key : rfType) { allData.put(key,form.get(key)); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/pdm/service/impl/WastecchangeServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/pdm/service/impl/WastecchangeServiceImpl.java index 936da453..d9ec493d 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/pdm/service/impl/WastecchangeServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/pdm/service/impl/WastecchangeServiceImpl.java @@ -15,6 +15,7 @@ import org.nl.exception.BadRequestException; import org.nl.modules.system.domain.DictDetail; import org.nl.modules.system.repository.DictDetailRepository; import org.nl.modules.system.service.DictDetailService; +import org.nl.utils.SpringContextHolder; import org.nl.wms.basedata.master.constant.MaterOptTypeEnum; import org.nl.wms.basedata.pdm.service.WastecchangeService; import org.nl.wms.basedata.pdm.service.dto.WastecchangeDto; @@ -53,7 +54,6 @@ public class WastecchangeServiceImpl implements WastecchangeService { @Autowired private DictDetailRepository dictDetailRepository; - @Override public Map queryAll(Map whereJson, Pageable page) { String material_code = MapUtil.getStr(whereJson, "material_code"); @@ -97,7 +97,7 @@ public class WastecchangeServiceImpl implements WastecchangeService { JSONObject allmaterialIds = WQL.getWO("PDM_WASTECCHANGE").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "mater.material_code"); JSONArray array = allmaterialIds.getJSONArray("content"); //label:name;value:code - List rfType = dictDetailRepository.findByDictName("MD_MATERIAL_WASTE_TYPE"); + List rfType = SpringContextHolder.getBean(DictDetailRepository.class).findByDictName("MD_MATERIAL_WASTE_TYPE"); Map typeMap = rfType.stream().collect(HashMap::new, (k, v) -> k.put(v.getValue(), v.getLabel()), HashMap::putAll); JSONArray array2 = new JSONArray(); if (ObjectUtil.isNotEmpty(array)){ @@ -141,7 +141,7 @@ public class WastecchangeServiceImpl implements WastecchangeService { @Override @Transactional(rollbackFor = Exception.class) public void update(JSONObject form) { - List rfType = dictDetailRepository.findByDictName("MD_MATERIAL_WASTE_TYPE").stream().map(DictDetail::getValue).collect(Collectors.toList()); + List rfType = SpringContextHolder.getBean(DictDetailRepository.class).findByDictName("MD_MATERIAL_WASTE_TYPE").stream().map(DictDetail::getValue).collect(Collectors.toList()); JSONObject allData = new JSONObject(); for (String key : rfType) { allData.put(key,form.get(key)); @@ -254,7 +254,7 @@ public class WastecchangeServiceImpl implements WastecchangeService { @Transactional(rollbackFor = Exception.class) public JSONArray contentShift(JSONObject json) { - List rfType = dictDetailRepository.findByDictName("MD_MATERIAL_WASTE_TYPE").stream().map(DictDetail::getValue).collect(Collectors.toList()); + List rfType = SpringContextHolder.getBean(DictDetailRepository.class).findByDictName("MD_MATERIAL_WASTE_TYPE").stream().map(DictDetail::getValue).collect(Collectors.toList()); JSONArray rf_arr = new JSONArray(); rfType.forEach(a->{ JSONObject json_CF = new JSONObject(); diff --git a/mes/qd/src/views/wms/st/core/inbill/rawassist/DivDialog.vue b/mes/qd/src/views/wms/st/core/inbill/rawassist/DivDialog.vue index 4d2fc1b0..27e5d4fc 100644 --- a/mes/qd/src/views/wms/st/core/inbill/rawassist/DivDialog.vue +++ b/mes/qd/src/views/wms/st/core/inbill/rawassist/DivDialog.vue @@ -14,7 +14,7 @@ 入库分配 - + 关闭 @@ -51,10 +51,10 @@ - - - - + + + + - - - + + + - + - + @@ -140,7 +141,7 @@ - + - - - - - - + + + + + + - - + + - - + + @@ -330,7 +334,8 @@ export default { }) }, toDelete(data) { - data.pop = true + this.$set(data, 'pop', true) + // data.pop = true }, close() { this.form.tableMater = [] @@ -395,7 +400,8 @@ export default { return } dis_dtl.storagevehicle_code = this.form.storagevehicle_code - dis_dtl.pop = false + // dis_dtl.pop = false + this.$set(dis_dtl, 'pop', false) this.form.tableMater.splice(this.form.tableMater.length, 0, dis_dtl) if (this.form.dtl_row.assign_qty) { this.form.dtl_row.assign_qty = parseFloat(this.form.dtl_row.assign_qty) + parseFloat(this.form.storage_qty) @@ -444,6 +450,7 @@ export default { }) }, deleteRow(index, rows) { + debugger // 如果桶状态不是生成调后台逻辑 if (rows[index].status !== '01') { crudRawAssist.deleteDisDtl(rows[index]).then(res => { @@ -453,9 +460,11 @@ export default { crudRawAssist.getDisDtl(this.form.dtl_row).then(res => { this.form.tableMater = res }) - rows[index].pop = false + // rows[index].pop = false + this.$set(rows[index], 'pop', false) }).catch(err => { - rows[index].pop = false + // rows[index].pop = false + this.$set(rows[index], 'pop', false) return }) } @@ -553,7 +562,8 @@ export default { } }, doCancel(data) { - data.pop = false + this.$set(data, 'pop', false) + // data.pop = false }, unDivStruct() { if (this.form.tableMater.length <= 0) {