diff --git a/hw-api/hw-api-mes/src/main/java/com/hw/mes/api/domain/MesPurchaseOrder.java b/hw-api/hw-api-mes/src/main/java/com/hw/mes/api/domain/MesPurchaseOrder.java index 0c89f2d9..ac0a00cb 100644 --- a/hw-api/hw-api-mes/src/main/java/com/hw/mes/api/domain/MesPurchaseOrder.java +++ b/hw-api/hw-api-mes/src/main/java/com/hw/mes/api/domain/MesPurchaseOrder.java @@ -305,6 +305,19 @@ public class MesPurchaseOrder extends BaseEntity { private String projectName;//项目名称 + /** + * 收料数量 + */ + private BigDecimal actLandAmount; + + public BigDecimal getActLandAmount() { + return actLandAmount; + } + + public void setActLandAmount(BigDecimal actLandAmount) { + this.actLandAmount = actLandAmount; + } + public Long getSerialNumber() { return serialNumber; } diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesPurchaseOrderController.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesPurchaseOrderController.java index 7ba94dae..8967a166 100644 --- a/hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesPurchaseOrderController.java +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesPurchaseOrderController.java @@ -229,14 +229,15 @@ public class MesPurchaseOrderController extends BaseController /** - * 查询采购订单信息,Join order_bind + * 查询采购订单信息,Join order_bind 新增原材料条码 */ // @RequiresPermissions("mes:purchaseOrder:list") @GetMapping("/getPurchaseOrdersWithBind") public TableDataInfo getPurchaseOrdersWithBind(MesPurchaseOrder mesPurchaseOrder) { startPage(); - List list = mesPurchaseOrderService.selectPurchaseOrderJoinList(mesPurchaseOrder); +// List list = mesPurchaseOrderService.selectPurchaseOrderJoinList(mesPurchaseOrder); + List list = mesPurchaseOrderService.selectPurchaseOrdersWithBindJoinList(mesPurchaseOrder); return getDataTable(list); } diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/mapper/MesPurchaseOrderMapper.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/mapper/MesPurchaseOrderMapper.java index aa977d9c..1807ad33 100644 --- a/hw-modules/hw-mes/src/main/java/com/hw/mes/mapper/MesPurchaseOrderMapper.java +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/mapper/MesPurchaseOrderMapper.java @@ -159,6 +159,10 @@ public interface MesPurchaseOrderMapper */ public MesPurchaseOrder selectMesPurchaseOrderJoinMaterialByPurchaseOrderId(Long purchaseOrderId); - - + /** + * 查询采购订单信息,Join order_bind 新增原材料条码 + * @param mesPurchaseOrder + * @return + */ + List selectPurchaseOrdersWithBindJoinList(MesPurchaseOrder mesPurchaseOrder); } diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/service/IMesPurchaseOrderService.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/IMesPurchaseOrderService.java index 03056e60..b140e552 100644 --- a/hw-modules/hw-mes/src/main/java/com/hw/mes/service/IMesPurchaseOrderService.java +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/IMesPurchaseOrderService.java @@ -179,4 +179,11 @@ public interface IMesPurchaseOrderService *采购订单超时统计 */ public void purchaseOrderOverTimeAlarm(); + + /** + * 查询采购订单信息,Join order_bind 新增原材料条码 + * @param mesPurchaseOrder + * @return + */ + List selectPurchaseOrdersWithBindJoinList(MesPurchaseOrder mesPurchaseOrder); } diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesBaseBarcodeInfoServiceImpl.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesBaseBarcodeInfoServiceImpl.java index 58fbf84a..53320b0d 100644 --- a/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesBaseBarcodeInfoServiceImpl.java +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesBaseBarcodeInfoServiceImpl.java @@ -203,37 +203,37 @@ public class MesBaseBarcodeInfoServiceImpl implements IMesBaseBarcodeInfoService BigDecimal barcodeAmount = mesBaseBarcodeInfo.getBarcodeAmount();//要生成的条码数量 String poNo = StringUtils.isEmpty(mesBaseBarcodeInfo.getPoNo()) ? "0" : mesBaseBarcodeInfo.getPoNo(); String batchCode = this.getRawBatchCode(poNo); -// if (!mesBaseMaterialInfo.getAlwaysFlag().equals(MesConstants.MES_MATERIAL_ALWAYS_FLAG_YES)) { - Long orderBindId = mesBaseBarcodeInfo.getOrderBindId(); - if (orderBindId == null) { - throw new ServiceException("请选择绑定销售订单信息的采购订单"); - } - - MesOrderBind mesOrderBind = mesOrderBindMapper.selectMesOrderBindByOrderBindId(orderBindId); - BigDecimal bindAmount = mesOrderBind.getBindAmount(); - BigDecimal bindBarcodeAmount = mesOrderBind.getBarcodeAmount();//已经生成的条码数量 - BigDecimal availableAmount = bindAmount.subtract(bindBarcodeAmount).setScale(0, RoundingMode.CEILING);;//可用数量向上取整 - if (barcodeAmount.compareTo(availableAmount) > 0) { - throw new ServiceException("条码数量不能大于可用数量"); - } +//// if (!mesBaseMaterialInfo.getAlwaysFlag().equals(MesConstants.MES_MATERIAL_ALWAYS_FLAG_YES)) { +// Long orderBindId = mesBaseBarcodeInfo.getOrderBindId(); +// if (orderBindId == null) { +// throw new ServiceException("请选择绑定销售订单信息的采购订单"); +// } +// +// MesOrderBind mesOrderBind = mesOrderBindMapper.selectMesOrderBindByOrderBindId(orderBindId); +// BigDecimal bindAmount = mesOrderBind.getBindAmount(); +// BigDecimal bindBarcodeAmount = mesOrderBind.getBarcodeAmount();//已经生成的条码数量 +// BigDecimal availableAmount = bindAmount.subtract(bindBarcodeAmount).setScale(0, RoundingMode.CEILING);;//可用数量向上取整 +// if (barcodeAmount.compareTo(availableAmount) > 0) { +// throw new ServiceException("条码数量不能大于可用数量"); +// } MesBaseBarcodeInfo toInsertedBarcodeInfo; for (long i = 0; i < barcodeAmount.intValue(); i++) { // 生成条码数量的不同条码内容 toInsertedBarcodeInfo = getInsertedBarcodeInfo(mesBaseBarcodeInfo, Seq.getId(Seq.mesBarcodeSeqType, Seq.mesBarcodeCode), batchCode, userName, currentDate); - toInsertedBarcodeInfo.setSaleOrderId(mesOrderBind.getSaleOrderId()); - toInsertedBarcodeInfo.setSaleorderCode(mesOrderBind.getSaleOrderCode()); - toInsertedBarcodeInfo.setSafeFlag(MesConstants.MES_ORDER_BIND_SAFE_FLAG_NO); + toInsertedBarcodeInfo.setSaleOrderId(0L); +// toInsertedBarcodeInfo.setSaleorderCode(mesOrderBind.getSaleOrderCode()); + toInsertedBarcodeInfo.setSafeFlag(MesConstants.MES_ORDER_BIND_SAFE_FLAG_YES); mesBaseBarcodeInfoMapper.insertMesBaseBarcodeInfo(toInsertedBarcodeInfo); } //更新订单绑定的条码已绑定数量 - mesOrderBind.setBarcodeAmount(bindBarcodeAmount.add(barcodeAmount)); - mesOrderBind.setUpdateBy(userName); - mesOrderBind.setUpdateTime(currentDate); - mesOrderBindMapper.updateMesOrderBind(mesOrderBind); +// mesOrderBind.setBarcodeAmount(bindBarcodeAmount.add(barcodeAmount)); +// mesOrderBind.setUpdateBy(userName); +// mesOrderBind.setUpdateTime(currentDate); +// mesOrderBindMapper.updateMesOrderBind(mesOrderBind); // } else { diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesPurchaseOrderServiceImpl.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesPurchaseOrderServiceImpl.java index 97280c84..b1aa3898 100644 --- a/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesPurchaseOrderServiceImpl.java +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesPurchaseOrderServiceImpl.java @@ -653,6 +653,16 @@ public class MesPurchaseOrderServiceImpl implements IMesPurchaseOrderService { } + /** + * 查询采购订单信息,Join order_bind 新增原材料条码 + * @param mesPurchaseOrder + * @return + */ + @Override + public List selectPurchaseOrdersWithBindJoinList(MesPurchaseOrder mesPurchaseOrder) { + return mesPurchaseOrderMapper.selectPurchaseOrdersWithBindJoinList(mesPurchaseOrder); + } + private static SysPointRouter getSysPointRouter(Long purchaseOrderId, Date currentDate) { SysPointRouter sysPointRouter = new SysPointRouter(); diff --git a/hw-modules/hw-mes/src/main/resources/mapper/mes/MesPurchaseOrderMapper.xml b/hw-modules/hw-mes/src/main/resources/mapper/mes/MesPurchaseOrderMapper.xml index dc804b29..e9a7e87d 100644 --- a/hw-modules/hw-mes/src/main/resources/mapper/mes/MesPurchaseOrderMapper.xml +++ b/hw-modules/hw-mes/src/main/resources/mapper/mes/MesPurchaseOrderMapper.xml @@ -66,6 +66,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -527,4 +528,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where a.purchase_order_id = #{purchaseOrderId} + + diff --git a/hw-ui/src/views/mes/purchaseOrder/addMultiplePurchaseOrder.vue b/hw-ui/src/views/mes/purchaseOrder/addMultiplePurchaseOrder.vue index c95b3d50..730011ca 100644 --- a/hw-ui/src/views/mes/purchaseOrder/addMultiplePurchaseOrder.vue +++ b/hw-ui/src/views/mes/purchaseOrder/addMultiplePurchaseOrder.vue @@ -18,27 +18,27 @@ /> - - - - 是 - - - 否 - - - + + + + + + + + + + - - - - 是 - - - 否 - - - + + + + + + + + + + @@ -82,13 +82,13 @@ - - - - - - - + + + + + + + { - response.rows.forEach(e => { - if(e.orderBindId){ - e.relateSaleOrderAmount = e.bindAmount - e.barcodeAmount; - } + response.rows.forEach((e, i) => { + // if(e.orderBindId){ + // e.relateSaleOrderAmount = e.bindAmount - e.barcodeAmount; + // } + e.relateSaleOrderAmount = e.actLandAmount e.receiveBillId = this.queryParams.receiveBillId; // 添加rowKey作为唯一标识 - e.rowKey = e.purchaseOrderId + '-' + e.orderBindId; + e.rowKey = e.purchaseOrderId + '-' + i; }); this.orderBindList = response.rows; diff --git a/hw-ui/src/views/mes/purchaseOrder/selectOrderBind.vue b/hw-ui/src/views/mes/purchaseOrder/selectOrderBind.vue index 2c079605..7b457f57 100644 --- a/hw-ui/src/views/mes/purchaseOrder/selectOrderBind.vue +++ b/hw-ui/src/views/mes/purchaseOrder/selectOrderBind.vue @@ -72,16 +72,16 @@ - - - - 是 - - - 否 - - - + + + + + + + + + + @@ -114,7 +114,7 @@ :reserve-selection="true" v-if="!isSingleSelect" > - + @@ -127,13 +127,13 @@ - - - - - - - + + + + + + + { response.rows.forEach(e => { - if(e.orderBindId){ - e.relateSaleOrderAmount = e.bindAmount - e.barcodeAmount; - } - + // if(e.orderBindId){ + // e.relateSaleOrderAmount = e.bindAmount - e.barcodeAmount; + // } + e.relateSaleOrderAmount = e.actLandAmount }); this.orderBindList = response.rows;