root/wms_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rev:质检模块

Browse Source
This commit is contained in:
ZHOUZ\Noble'lift
2023-06-25 14:56:13 +08:00
parent c576f04413
commit 44ed1da408
6 changed files with 113 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/dao/PcsIfPurchaseorder.java
View File

@@ -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;
/**
* 确认时间

6
mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/impl/PcsIfPurchaseorderServiceImpl.java
View File

@@ -60,15 +60,15 @@ public class PcsIfPurchaseorderServiceImpl extends ServiceImpl<PcsIfPurchaseorde
}
PcsIfPurchaseorder purchaseorder = this.getOne(new QueryWrapper<PcsIfPurchaseorder>().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("到货中"));