diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/check/impl/StIvtCheckmstCpServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/check/impl/StIvtCheckmstCpServiceImpl.java index cf4edfd3..602b53c5 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/check/impl/StIvtCheckmstCpServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/check/impl/StIvtCheckmstCpServiceImpl.java @@ -43,6 +43,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; +import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.Map; @@ -343,7 +344,24 @@ public class StIvtCheckmstCpServiceImpl extends ServiceImpl maps = mdPbBucketrecordMapper.queryAll(whereJson); + + if (ObjectUtil.isEmpty(maps)) { + JSONObject param = new JSONObject(); + param.put("checkdtl_id", whereJson.getString("checkdtl_id")); + + List checkDtl = this.getCheckDtl(param); + + for (Map json : checkDtl) { + json.put("storage_qty", json.get("base_qty")); + } + + maps = checkDtl; + } + + + return maps; } @Override diff --git a/mes/qd/src/views/wms/storage_manage/product/productCheck/ReCheckDialog.vue b/mes/qd/src/views/wms/storage_manage/product/productCheck/ReCheckDialog.vue index 6bb6f665..16a68358 100644 --- a/mes/qd/src/views/wms/storage_manage/product/productCheck/ReCheckDialog.vue +++ b/mes/qd/src/views/wms/storage_manage/product/productCheck/ReCheckDialog.vue @@ -140,7 +140,7 @@ export default { }, methods: { open() { - check.getBucketrecord({ 'storagevehicle_code': this.form.storagevehicle_code, 'status': '3' }).then(res => { + check.getBucketrecord({ 'storagevehicle_code': this.form.storagevehicle_code, 'status': '3', 'checkdtl_id': this.form.checkdtl_id}).then(res => { this.tableData = res // 将明细变成不可编辑 for (let i = 0; i < this.tableData.length; i++) { @@ -248,10 +248,6 @@ export default { this.crud.notify('物料不可为空!', CRUD.NOTIFICATION_TYPE.INFO) return false } - if (!row.bucketunique) { - this.crud.notify('桶号不可为空!', CRUD.NOTIFICATION_TYPE.INFO) - return false - } let qty = 0 for (let i = 0; i < this.tableData.length; i++) { if ((this.tableData[i].bucketunique === row.bucketunique) && (index !== i)) {