diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_PB_BAGRECORD01.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_PB_BAGRECORD01.wql index 61020a77..f5446d2d 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_PB_BAGRECORD01.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_PB_BAGRECORD01.wql @@ -49,7 +49,24 @@ IF 输入.flag = "1" PAGEQUERY SELECT - bag.*, + bag.bagrecord_id, + bag.bag_id, + bag.material_id, + bag.pcsn, + bag.qty_unit_name, + bag.storage_qty, + bag.seqno, + bag.remark, + bag.waste_type, + bag.return_person, + bag.print_times, + bag.status, + bag.input_time, + bag.bucketunique, + bag.makeup_optname, + bag.makeup_time, + bag.print_type, + mater1.material_code, mater1.material_name, mater1.ext_id, diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_PB_BUCKETRECORD.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_PB_BUCKETRECORD.wql index d417ae71..58292d9a 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_PB_BUCKETRECORD.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_PB_BUCKETRECORD.wql @@ -51,17 +51,32 @@ IF 输入.flag = "1" PAGEQUERY SELECT - br.*, + br.bucket_record_id, + br.bucketunique, + br.storagevehicle_type, + br.pcsn, + br.ivt_level, + br.is_active, + br.quality_scode, + br.qty_unit_name, + br.storage_qty, + br.record_order, + br.bag_qty, + br.remark, + br.status, + br.create_name, + br.create_time, + br.storagevehicle_code, + br.print_type, + mater.material_code, mater.material_name, mater.ext_id, - unit.unit_name, point.point_code FROM MD_PB_BucketRecord br LEFT JOIN md_me_materialbase mater ON br.material_id = mater.material_id LEFT JOIN md_pb_measureunit unit ON br.qty_unit_id = unit.measure_unit_id - LEFT JOIN sys_user user ON user.user_id = br.create_id LEFT JOIN sch_base_point point ON br.storagevehicle_code = point.vehicle_code and br.storagevehicle_code <> '' WHERE 1=1 @@ -70,8 +85,7 @@ ENDOPTION OPTION 输入.create_id <> "" - (user.username like 输入.create_id or - user.nick_name like 输入.create_id) + br.create_name like 输入.create_id ENDOPTION OPTION 输入.point_code <> "" diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/service/impl/ProductplanSumServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/service/impl/ProductplanSumServiceImpl.java index 8e8a2f5c..356ffe5d 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/service/impl/ProductplanSumServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/service/impl/ProductplanSumServiceImpl.java @@ -226,15 +226,12 @@ public class ProductplanSumServiceImpl implements ProductplanSumService { dto.setRemark(remark); dto.setTask_code(CodeUtil.getNewCode("PCS_TASK_CODE")); //判断表里有没有此条记录 - JSONObject jsonObject = planProcTab.query("plan_org_code = '" + plan_org_code + "' and plan_month = '" + plan_month + "' and material_code ='" + material_code + "' and plan_finish_date = '"+plan_finish_date+"'").uniqueResult(0); + JSONObject jsonObject = planProcTab.query("plan_org_code = '" + plan_org_code + "' and material_code ='" + material_code + "' and plan_finish_date = '"+plan_finish_date+"'").uniqueResult(0); if (ObjectUtil.isEmpty(jsonObject)) { - //如果是空的就插入两张表 + //如果是空的就插入处理表 planProcTab.insert(JSONObject.parseObject(JSON.toJSONString(dto))); } else { - if (!StrUtil.equals(jsonObject.getString("is_proc"), IsProcEnum.GENERATE.getCode())) { - //非生成状态 返回错误信息 - throw new BadRequestException("此月度计划已存在并不可在修改"); - } else { + if (StrUtil.equals(jsonObject.getString("is_proc"), IsProcEnum.GENERATE.getCode())) { //如果是生成状态则将当前记录删除，在重新插入 planProcTab.delete(jsonObject); planProcTab.insert(JSONObject.parseObject(JSON.toJSONString(dto))); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/service/impl/ProductplanprocServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/service/impl/ProductplanprocServiceImpl.java index 35c4e5c3..c5010ab5 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/service/impl/ProductplanprocServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs/service/impl/ProductplanprocServiceImpl.java @@ -242,15 +242,12 @@ public class ProductplanprocServiceImpl implements ProductplanprocService { dto.setRemark(remark); dto.setTask_code(CodeUtil.getNewCode("PCS_TASK_CODE")); //判断表里有没有此条记录 - JSONObject jsonObject = planProcTab.query("plan_org_code = '" + plan_org_code + "' and plan_month = '" + plan_month + "' and material_code ='" + material_code + "' and plan_finish_date = '"+plan_finish_date+"'").uniqueResult(0); + JSONObject jsonObject = planProcTab.query("plan_org_code = '" + plan_org_code + "' and material_code ='" + material_code + "' and plan_finish_date = '"+plan_finish_date+"'").uniqueResult(0); if (ObjectUtil.isEmpty(jsonObject)) { //如果是空的就插入两张表 planProcTab.insert(JSONObject.parseObject(JSON.toJSONString(dto))); } else { - if (!StrUtil.equals(jsonObject.getString("is_proc"), IsProcEnum.GENERATE.getCode())) { - //非生成状态 返回错误信息 - throw new BadRequestException("此月度计划已存在并不可在修改"); - } else { + if (StrUtil.equals(jsonObject.getString("is_proc"), IsProcEnum.GENERATE.getCode())) { //如果是生成状态则将当前记录删除，在重新插入 planProcTab.delete(jsonObject); planProcTab.insert(JSONObject.parseObject(JSON.toJSONString(dto))); diff --git a/mes/qd/src/views/wms/basedata/master/bucketrecord/index.vue b/mes/qd/src/views/wms/basedata/master/bucketrecord/index.vue index 4f837f82..6429ed09 100644 --- a/mes/qd/src/views/wms/basedata/master/bucketrecord/index.vue +++ b/mes/qd/src/views/wms/basedata/master/bucketrecord/index.vue @@ -111,7 +111,7 @@ v-model="query.create_id" clearable size="mini" - placeholder="请输入创建人或工号" + placeholder="请输入创建人" style="width: 230px;" class="filter-item" @keyup.enter.native="crud.toQuery" diff --git a/mes/qd/src/views/wms/pcs/productplanproc/index.vue b/mes/qd/src/views/wms/pcs/productplanproc/index.vue index 80c4c892..5250621f 100644 --- a/mes/qd/src/views/wms/pcs/productplanproc/index.vue +++ b/mes/qd/src/views/wms/pcs/productplanproc/index.vue @@ -342,6 +342,8 @@ export default { this.crud.notify('上传成功', CRUD.NOTIFICATION_TYPE.SUCCESS) this.crud.toQuery() this.fla = false + }).catch(() => { + this.fla = false }) }, // 监听上传失败 diff --git a/mes/qd/src/views/wms/pcs/productplansum/SumShowDialog.vue b/mes/qd/src/views/wms/pcs/productplansum/SumShowDialog.vue index f09c1a00..ce698410 100644 --- a/mes/qd/src/views/wms/pcs/productplansum/SumShowDialog.vue +++ b/mes/qd/src/views/wms/pcs/productplansum/SumShowDialog.vue @@ -197,6 +197,8 @@ export default { this.tableData = res this.crud.notify('汇总完成', CRUD.NOTIFICATION_TYPE.SUCCESS) this.fla = false + }).catch(() => { + this.fla = false }) } } diff --git a/mes/qd/src/views/wms/pcs/productplansum/index.vue b/mes/qd/src/views/wms/pcs/productplansum/index.vue index c40f2c99..61b299fa 100644 --- a/mes/qd/src/views/wms/pcs/productplansum/index.vue +++ b/mes/qd/src/views/wms/pcs/productplansum/index.vue @@ -382,6 +382,8 @@ export default { this.crud.notify('上传成功', CRUD.NOTIFICATION_TYPE.SUCCESS) this.crud.toQuery() this.fla = false + }).catch(() => { + this.fla = false }) }, // 监听上传失败