diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/ext/lk/service/impl/LkToWmsServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/ext/lk/service/impl/LkToWmsServiceImpl.java index 3c90aa10..a366a522 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/ext/lk/service/impl/LkToWmsServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/ext/lk/service/impl/LkToWmsServiceImpl.java @@ -32,6 +32,8 @@ public class LkToWmsServiceImpl implements LkToWmsService { @Override public JSONObject stockApply(JSONObject json) { + // 打印日志 + log.info("出库申请输入参数:"+json.toString()); LKEmptyVehicleTask lkEmptyVehicleTask = new LKEmptyVehicleTask(); String pallet_code = json.getString("pallet_code"); @@ -101,6 +103,8 @@ public class LkToWmsServiceImpl implements LkToWmsService { @Override public JSONObject stockConfirm(JSONObject json) { + // 打印日志 + log.info("库存确认结果反馈输入参数:"+json.toString()); // 立库出库确认信息表 WQLObject pdmTab = WQLObject.getWQLObject("PDM_LK_OutPalletMateril"); // 载具信息表 diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/ext/lk/service/impl/WmsToLkServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/ext/lk/service/impl/WmsToLkServiceImpl.java index e55bdc42..b58285e2 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/ext/lk/service/impl/WmsToLkServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/ext/lk/service/impl/WmsToLkServiceImpl.java @@ -46,6 +46,7 @@ public class WmsToLkServiceImpl implements WmsToLkService { .body(String.valueOf(json)) .execute().body(); result = JSONObject.parseObject(resultMsg); + return result; } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/em/wql/QEM_BI_DEVICEINFO01.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/em/wql/QEM_BI_DEVICEINFO01.wql index 6ae6481c..a0b16aad 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/em/wql/QEM_BI_DEVICEINFO01.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/em/wql/QEM_BI_DEVICEINFO01.wql @@ -18,6 +18,7 @@ 输入.workprocedure_code TYPEAS s_string 输入.workprocedure_id TYPEAS s_string 输入.is_active TYPEAS s_string + 输入.is_produceuse TYPEAS s_string [临时表] @@ -52,9 +53,11 @@ LEFT JOIN sys_dict_detail d ON e.device_attribute_scode = d.value AND name = 'DEVICE_ATTRIBUTE_SCODE' WHERE e.is_delete = '0' - OPTION 输入.workprocedure_code <> "" e.workprocedure_code = 输入.workprocedure_code + ENDOPTION + OPTION 输入.is_produceuse <> "" + e.is_produceuse = 输入.is_produceuse ENDOPTION OPTION 输入.workprocedure_id <> "" e.workprocedure_id = 输入.workprocedure_id 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/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/ProducetaskprocServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/ProducetaskprocServiceImpl.java index 16b7b251..8ce6abbe 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/ProducetaskprocServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/ProducetaskprocServiceImpl.java @@ -281,7 +281,7 @@ public class ProducetaskprocServiceImpl implements ProducetaskprocService { if (ObjectUtil.isEmpty(jsonObject)) { planProcTab.insert(JSONObject.parseObject(JSON.toJSONString(dto))); } else { - if (!StrUtil.equals(jsonObject.getString("is_proc"), "2")) { + if (StrUtil.equals(jsonObject.getString("is_proc"), "2")) { continue; } else { //如果是生成状态则将当前记录删除，在重新插入 diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QPDM_PRODUCTDAILYPLAN.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QPDM_PRODUCTDAILYPLAN.wql index 19635d24..d5568e11 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QPDM_PRODUCTDAILYPLAN.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QPDM_PRODUCTDAILYPLAN.wql @@ -118,7 +118,6 @@ LEFT JOIN md_pb_classstandard classstandard2 ON classstandard2.class_id = ext.product_series LEFT JOIN PCS_IF_ProductPlanProc ProductPlanProc ON ProductPlanProc.plan_id = pp.plan_id WHERE - 1=1 OPTION 输入.status <> "" pp.status = 输入.status diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/InitformulaServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/InitformulaServiceImpl.java index 4b461702..a8abd529 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/InitformulaServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/InitformulaServiceImpl.java @@ -400,6 +400,10 @@ public class InitformulaServiceImpl implements InitformulaService { //是否软废 if(MaterOptTypeEnum.RD_AND_PG.getClass_idStr().contains(md_jo.getString("material_type_id"))){ JSONObject pro_jo = md_me_producmaterialext.query("material_id='"+jo.getString("material_id")+"'").uniqueResult(0); + if(pro_jo ==null){ + throw new BadRequestException("物料"+jo.getString("material_code")+" "+jo.getString("material_name")+"未设置成品物料扩展信息！"); + + } double net_rate = pro_jo.getDouble("net_rate"); RF_total = RF_total+jo.getDouble("formula_qty")*pro_jo.getDouble("net_rate")/100.0; } @@ -504,6 +508,9 @@ public class InitformulaServiceImpl implements InitformulaService { //是否软废 if(MaterOptTypeEnum.RD_AND_PG.getClass_idStr().contains(md_jo.getString("material_type_id"))){ JSONObject pro_jo = md_me_producmaterialext.query("material_id='"+jo.getString("material_id")+"'").uniqueResult(0); + if(pro_jo ==null){ + throw new BadRequestException("物料"+jo.getString("material_code")+" "+jo.getString("material_name")+"未设置成品物料扩展信息！"); + } double net_rate = pro_jo.getDouble("net_rate"); RF_total = RF_total+jo.getDouble("formula_qty")*pro_jo.getDouble("net_rate")/100.0; } @@ -686,6 +693,9 @@ public class InitformulaServiceImpl implements InitformulaService { //是否软废 if(MaterOptTypeEnum.RD_AND_PG.getClass_idStr().contains(md_jo.getString("material_type_id"))){ JSONObject pro_jo = md_me_producmaterialext.query("material_id='"+jo.getString("material_id")+"'").uniqueResult(0); + if(pro_jo ==null){ + throw new BadRequestException("物料"+jo.getString("material_code")+" "+jo.getString("material_name")+"未设置成品物料扩展信息！"); + } double net_rate = pro_jo.getDouble("net_rate"); RF_total = RF_total+jo.getDouble("formula_qty")*pro_jo.getDouble("net_rate")/100.0; } @@ -791,6 +801,9 @@ public class InitformulaServiceImpl implements InitformulaService { //是否软废 if(MaterOptTypeEnum.RD_AND_PG.getClass_idStr().contains(md_jo.getString("material_type_id"))){ JSONObject pro_jo = md_me_producmaterialext.query("material_id='"+jo.getString("material_id")+"'").uniqueResult(0); + if(pro_jo ==null){ + throw new BadRequestException("物料"+jo.getString("material_code")+" "+jo.getString("material_name")+"未设置成品物料扩展信息！"); + } double net_rate = pro_jo.getDouble("net_rate"); RF_total = RF_total+jo.getDouble("formula_qty")*pro_jo.getDouble("net_rate")/100.0; } diff --git a/mes/hd/nladmin-system/src/main/resources/log/LKToMes.xml b/mes/hd/nladmin-system/src/main/resources/log/LKToMes.xml new file mode 100644 index 00000000..760c9443 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/resources/log/LKToMes.xml @@ -0,0 +1,28 @@ + + + + + + + + + ${LOG_HOME}/MesToErp/%d{yyyy-MM-dd}.%i.log + + 15 + + 200MB + + 20GB + + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n + + + + + + + + + diff --git a/mes/hd/nladmin-system/src/main/resources/logback-spring.xml b/mes/hd/nladmin-system/src/main/resources/logback-spring.xml index b5a0a731..7ccca514 100644 --- a/mes/hd/nladmin-system/src/main/resources/logback-spring.xml +++ b/mes/hd/nladmin-system/src/main/resources/logback-spring.xml @@ -18,6 +18,7 @@ https://juejin.cn/post/6844903775631572999 + 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 }) }, // 监听上传失败 diff --git a/mes/qd/src/views/wms/pdm/produce/worktask/index.vue b/mes/qd/src/views/wms/pdm/produce/worktask/index.vue index c98bede7..1a1caf4c 100644 --- a/mes/qd/src/views/wms/pdm/produce/worktask/index.vue +++ b/mes/qd/src/views/wms/pdm/produce/worktask/index.vue @@ -106,7 +106,7 @@ - + - +