From 9fa5a228f1b5acdc7c69722ba467b2f776d12181 Mon Sep 17 00:00:00 2001 From: xins Date: Mon, 23 Sep 2024 18:04:13 +0800 Subject: [PATCH] =?UTF-8?q?3.1.2:=20MES:=20=E7=89=A9=E6=96=99=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=A2=9E=E5=8A=A0=E7=B1=BB=E5=9E=8B=E3=80=81=E8=BE=85?= =?UTF-8?q?=E6=96=99=E6=A0=87=E8=AF=86=E3=80=81=E8=87=AA=E5=8A=A8=E5=87=BA?= =?UTF-8?q?=E5=BA=93=E6=A0=87=E8=AF=86=E3=80=81=E4=BD=8E=E5=80=BC=E6=98=93?= =?UTF-8?q?=E8=80=97=E5=93=81=E6=A0=87=E8=AF=86=EF=BC=9B=E5=AE=8C=E6=88=90?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E7=9A=84=E4=BF=AE=E6=94=B9=E5=92=8C=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=8A=9F=E8=83=BD=E5=BC=80=E5=8F=91=20=E7=89=A9?= =?UTF-8?q?=E6=96=99=E6=9D=A1=E7=A0=81=EF=BC=9A=E5=8A=9F=E8=83=BD=E5=AE=8C?= =?UTF-8?q?=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/api/domain/MesBaseMaterialInfo.java | 34 +++ .../controller/MesProductOrderController.java | 1 + .../java/com/hw/mes/domain/MesSaleOrder.java | 26 ++ .../impl/MesProductOrderServiceImpl.java | 2 +- .../impl/MesProductPlanServiceImpl.java | 4 +- .../mapper/mes/MesBaseMaterialInfoMapper.xml | 17 ++ .../mapper/mes/MesProductOrderMapper.xml | 2 +- .../mapper/mes/MesSaleOrderMapper.xml | 3 + hw-ui/src/views/mes/barcode/index.vue | 16 +- hw-ui/src/views/mes/materialinfo/index.vue | 263 ++++++++++++++---- .../views/mes/productOrder/addSaleOrder.vue | 146 +++++++--- hw-ui/src/views/mes/productOrder/index.vue | 10 +- 12 files changed, 413 insertions(+), 111 deletions(-) diff --git a/hw-api/hw-api-mes/src/main/java/com/hw/mes/api/domain/MesBaseMaterialInfo.java b/hw-api/hw-api-mes/src/main/java/com/hw/mes/api/domain/MesBaseMaterialInfo.java index c74e4c8a..e47ef667 100644 --- a/hw-api/hw-api-mes/src/main/java/com/hw/mes/api/domain/MesBaseMaterialInfo.java +++ b/hw-api/hw-api-mes/src/main/java/com/hw/mes/api/domain/MesBaseMaterialInfo.java @@ -128,6 +128,15 @@ public class MesBaseMaterialInfo extends BaseEntity /**申请标识(1是，0否)，代表是否需要申请才能出库*/ private String applyFlag; + /**自动出库标识(1是，0否)*/ + private String autoOutstockFlag; + + /**辅料标识(1是，0否)*/ + private String accessoriesFlag; + + /**低值易耗品标识(1是，0否),用来分摊各销售订单使用的物料数量*/ + private String lowValueConsumableFlag; + /** erp最后更新日期;对应FModifyDate */ @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "erp最后更新日期;对应FModifyDate", width = 30, dateFormat = "yyyy-MM-dd") @@ -140,6 +149,7 @@ public class MesBaseMaterialInfo extends BaseEntity private String selectType;//3是选择实际生产的物料信息，需要过滤是到511仓库的物料 + public Long getPurchasePriceUnitId() { return purchasePriceUnitId; } @@ -398,6 +408,30 @@ public class MesBaseMaterialInfo extends BaseEntity this.applyFlag = applyFlag; } + public String getAutoOutstockFlag() { + return autoOutstockFlag; + } + + public void setAutoOutstockFlag(String autoOutstockFlag) { + this.autoOutstockFlag = autoOutstockFlag; + } + + public String getAccessoriesFlag() { + return accessoriesFlag; + } + + public void setAccessoriesFlag(String accessoriesFlag) { + this.accessoriesFlag = accessoriesFlag; + } + + public String getLowValueConsumableFlag() { + return lowValueConsumableFlag; + } + + public void setLowValueConsumableFlag(String lowValueConsumableFlag) { + this.lowValueConsumableFlag = lowValueConsumableFlag; + } + public void setErpModifyDate(Date erpModifyDate) { this.erpModifyDate = erpModifyDate; diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesProductOrderController.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesProductOrderController.java index a72de747..6c951600 100644 --- a/hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesProductOrderController.java +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesProductOrderController.java @@ -41,6 +41,7 @@ public class MesProductOrderController extends BaseController { @Autowired private IMesSaleOrderService mesSaleOrderService; + /** * 查询生产工单列表 */ diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesSaleOrder.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesSaleOrder.java index ed312fa0..faa3587a 100644 --- a/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesSaleOrder.java +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesSaleOrder.java @@ -186,6 +186,16 @@ public class MesSaleOrder extends BaseEntity { private List mesPurchaseOrderList; + /** + * 选择关联的销售订单信息标识 + */ + private String relateFlag; + + /** + * 选择销售订单信息标识 + */ + private String selectFlag; + public String getMaterialModel() { return materialModel; } @@ -426,6 +436,22 @@ public class MesSaleOrder extends BaseEntity { this.mesPurchaseOrderList = mesPurchaseOrderList; } + public String getRelateFlag() { + return relateFlag; + } + + public void setRelateFlag(String relateFlag) { + this.relateFlag = relateFlag; + } + + public String getSelectFlag() { + return selectFlag; + } + + public void setSelectFlag(String selectFlag) { + this.selectFlag = selectFlag; + } + @Override public String toString() { return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesProductOrderServiceImpl.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesProductOrderServiceImpl.java index d2a15a8d..4f9ac687 100644 --- a/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesProductOrderServiceImpl.java +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesProductOrderServiceImpl.java @@ -130,7 +130,7 @@ public class MesProductOrderServiceImpl implements IMesProductOrderService { MesProductOrder dbProductOrder = mesProductOrderMapper.selectMesProductOrderByProductOrderId(mesProductOrder.getProductOrderId()); if (!dbProductOrder.getOrderStatus().equals(MesConstants.UN_PUBLISH)) { String orderStatusPrompt = MesConstants.ORDER_STATUS_PROMPT_MAP.get(dbProductOrder.getOrderStatus()); - throw new ServiceException(String.format("此生产任务已经%s,不能修改!", orderStatusPrompt)); + throw new ServiceException(String.format("此生产任务状态为%s,不能修改!", orderStatusPrompt)); } //如果修改了前置任务，则开始时间不能小于前置任务的结束时间 diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesProductPlanServiceImpl.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesProductPlanServiceImpl.java index d950b378..61b9d4cd 100644 --- a/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesProductPlanServiceImpl.java +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesProductPlanServiceImpl.java @@ -280,7 +280,7 @@ public class MesProductPlanServiceImpl implements IMesProductPlanService { String orderStatus = mesProductOrder.getOrderStatus(); if (!orderStatus.equals(MesConstants.BEGIN) && !orderStatus.equals(MesConstants.PUBLISHED) && !orderStatus.equals(MesConstants.PAUSE)) { String orderStatusPrompt = MesConstants.ORDER_STATUS_PROMPT_MAP.get(orderStatus); - throw new ServiceException(String.format("此生产任务已经%s,不能派工!", orderStatusPrompt)); + throw new ServiceException(String.format("此生产任务状态为%s,不能派工!", orderStatusPrompt)); } BigDecimal dispatchedAmount = mesProductOrder.getDispatchAmount() == null ? BigDecimal.ZERO : mesProductOrder.getDispatchAmount(); @@ -351,7 +351,7 @@ public class MesProductPlanServiceImpl implements IMesProductPlanService { mesProductOrder.setDispatchAmount(updateDispatchAmount); mesProductOrder.setUpdateTime(currentDate); mesProductOrder.setUpdateBy(userName); - mesProductOrderService.updateMesProductOrder(mesProductOrder); + mesProductOrderMapper.updateMesProductOrder(mesProductOrder); return 1; } diff --git a/hw-modules/hw-mes/src/main/resources/mapper/mes/MesBaseMaterialInfoMapper.xml b/hw-modules/hw-mes/src/main/resources/mapper/mes/MesBaseMaterialInfoMapper.xml index 6a8dec08..bf72bcf1 100644 --- a/hw-modules/hw-mes/src/main/resources/mapper/mes/MesBaseMaterialInfoMapper.xml +++ b/hw-modules/hw-mes/src/main/resources/mapper/mes/MesBaseMaterialInfoMapper.xml @@ -39,6 +39,9 @@ + + + @@ -71,6 +74,10 @@ bmi.active_flag, bmi.deleted_flag, bmi.apply_flag, + bmi.material_classfication, + bmi.auto_outstock_flag, + bmi.accessories_flag, + bmi.low_value_consumable_flag, bmi.remark, bmi.create_by, bmi.create_time, @@ -117,6 +124,13 @@ and bmi.deleted_flag = #{deletedFlag} and bmi.approve_date = #{approveDate} and bmi.erp_modify_date = #{erpModifyDate} + + and bmi.material_classfication = #{materialClassfication} + and bmi.auto_outstock_flag = #{autoOutstockFlag} + and bmi.accessories_flag = #{accessoriesFlag} + and bmi.low_value_consumable_flag = #{lowValueConsumableFlag} + + and exists (select 1 from wms_warehouse_material wwm where wwm.storage_type='1' and wwm.warehouse_id=511 and wwm.storage_id=bmi.material_id) @@ -229,6 +243,9 @@ erp_modify_date = #{erpModifyDate}, always_flag = #{alwaysFlag}, batch_amount = #{batchAmount}, + auto_outstock_flag = #{autoOutstockFlag}, + accessories_flag = #{accessoriesFlag}, + low_value_consumable_flag = #{lowValueConsumableFlag}, where material_id = #{materialId} diff --git a/hw-modules/hw-mes/src/main/resources/mapper/mes/MesProductOrderMapper.xml b/hw-modules/hw-mes/src/main/resources/mapper/mes/MesProductOrderMapper.xml index fabb166b..13442ba1 100644 --- a/hw-modules/hw-mes/src/main/resources/mapper/mes/MesProductOrderMapper.xml +++ b/hw-modules/hw-mes/src/main/resources/mapper/mes/MesProductOrderMapper.xml @@ -375,7 +375,7 @@ AND (plan_begin_time <= #{params.planEndTime} AND plan_end_time >= #{params.planBeginTime}) - order by mpo.plan_begin_time,order_status + order by mpo.product_order_id desc diff --git a/hw-modules/hw-mes/src/main/resources/mapper/mes/MesSaleOrderMapper.xml b/hw-modules/hw-mes/src/main/resources/mapper/mes/MesSaleOrderMapper.xml index a84b629b..b91c68ab 100644 --- a/hw-modules/hw-mes/src/main/resources/mapper/mes/MesSaleOrderMapper.xml +++ b/hw-modules/hw-mes/src/main/resources/mapper/mes/MesSaleOrderMapper.xml @@ -266,6 +266,9 @@ '%') and mso.is_release = #{isRelease} and mso.sale_order_classfication = #{saleOrderClassfication} + and exists (select 1 from mes_sale_order_relate msor where mso.sale_order_id = msor.relate_sale_order_id) + and not exists (select 1 from mes_sale_order_relate msor where mso.sale_order_id = msor.relate_sale_order_id) + order by mso.erp_modify_date desc diff --git a/hw-ui/src/views/mes/barcode/index.vue b/hw-ui/src/views/mes/barcode/index.vue index f4abb07c..d3fe085d 100644 --- a/hw-ui/src/views/mes/barcode/index.vue +++ b/hw-ui/src/views/mes/barcode/index.vue @@ -660,7 +660,7 @@
确 定 - 取 消 + 取 消
@@ -1314,8 +1314,16 @@ export default { /** 修改按钮操作 */ handleUpdate(row) { + const barcodeId = row.barcodeId; if (row.singleFlag === this.SINGLE_FLAG.MERGE) { this.resetRelate(); + getBarcode(barcodeId).then(response => { + this.materialRelateForm = response.data + this.materialRelateForm.barcodeAmount=1; + this.materialRelateOpen = true; + this.materialRelateTitle = "修改合并原材料条码信息"; + }); + } else { if (row.purchaseOrderId === 0) { this.resetNoPurchase(); @@ -1325,14 +1333,8 @@ export default { } - const barcodeId = row.barcodeId; - getBarcode(barcodeId).then(response => { - - this.open = true; - this.title = "修改原材料条码信息"; - }); }, /** 提交按钮 */ submitForm() { diff --git a/hw-ui/src/views/mes/materialinfo/index.vue b/hw-ui/src/views/mes/materialinfo/index.vue index 696a1e11..35a17b67 100644 --- a/hw-ui/src/views/mes/materialinfo/index.vue +++ b/hw-ui/src/views/mes/materialinfo/index.vue @@ -1,6 +1,17 @@ + + + + + + + + +