diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/dao/PcsIfPurchaseorder.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/dao/PcsIfPurchaseorder.java index 56e68611..62ea37e6 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/dao/PcsIfPurchaseorder.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/dao/PcsIfPurchaseorder.java @@ -114,7 +114,7 @@ public class PcsIfPurchaseorder implements Serializable { /** * 提交人 */ - private String audit_optid; + private String audit_id; /** * 提交时间 @@ -124,17 +124,17 @@ public class PcsIfPurchaseorder implements Serializable { /** * 提交人姓名 */ - private String audit_optname; + private String audit_name; /** * 确认人 */ - private String confirm_optid; + private String confirm_id; /** * 确认人姓名 */ - private String confirm_optname; + private String confirm_name; /** * 确认时间 diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/impl/PcsIfPurchaseorderServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/impl/PcsIfPurchaseorderServiceImpl.java index d5d9c380..3ecb2e97 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/impl/PcsIfPurchaseorderServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/impl/PcsIfPurchaseorderServiceImpl.java @@ -60,15 +60,15 @@ public class PcsIfPurchaseorderServiceImpl extends ServiceImpl().eq("po_code", po_code)); - if (purchaseorder.getSTATUS().equals(PCSEnum.BILL_STATUS.code("确认"))) { + if (purchaseorder.getSTATUS().equals(PCSEnum.BILL_STATUS.code("完成"))) { throw new BadRequestException("当前单据状态已经完成,无法进行入库数修改!"); } BigDecimal new_instor_qty = NumberUtil.add(instor_qty, purchaseorder.getInstor_qty(), 3); if (purchaseorder.getTotal_qty().compareTo(new_instor_qty) <= 0) { purchaseorder.setSTATUS(PCSEnum.BILL_STATUS.code("完成")); - purchaseorder.setConfirm_optid(SecurityUtils.getCurrentUserId()); - purchaseorder.setConfirm_optname(SecurityUtils.getCurrentNickName()); + purchaseorder.setConfirm_id(SecurityUtils.getCurrentUserId()); + purchaseorder.setConfirm_name(SecurityUtils.getCurrentNickName()); purchaseorder.setConfirm_time(DateUtil.now()); } else { purchaseorder.setSTATUS(PCSEnum.BILL_STATUS.code("到货中")); diff --git a/mes/qd/src/views/wms/ql_manage/physicalMst/Dialog1.vue b/mes/qd/src/views/wms/ql_manage/physicalMst/Dialog1.vue index 8ca0f248..4486e7b3 100644 --- a/mes/qd/src/views/wms/ql_manage/physicalMst/Dialog1.vue +++ b/mes/qd/src/views/wms/ql_manage/physicalMst/Dialog1.vue @@ -326,7 +326,7 @@