From a5951f53ca8e05e50c24ade588416861b9769c52 Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Fri, 29 Nov 2024 10:49:47 +0800 Subject: [PATCH] =?UTF-8?q?[feat]=E9=94=80=E5=94=AE=E7=AE=A1=E7=90=86=20?= =?UTF-8?q?=E9=94=80=E5=94=AE=E5=87=BA=E8=B4=A7=E5=89=8D=E7=AB=AF=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E6=96=B0=E5=A2=9E=20=E7=89=A9=E6=96=99=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E3=80=81=E7=89=A9=E6=96=99=E5=8D=95=E4=BD=8D=E3=80=81?= =?UTF-8?q?=E5=8A=A0=E5=B7=A5=E6=96=B9=E5=BC=8F=E5=8A=A0=E4=B8=8A=E5=AD=97?= =?UTF-8?q?=E5=85=B8=E5=B1=9E=E6=80=A7=20=E4=BF=AE=E5=A4=8D=E9=94=80?= =?UTF-8?q?=E5=94=AE=E8=AE=A2=E5=8D=95=E6=96=B0=E5=A2=9E=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E7=89=A9=E6=96=99=E5=90=88=E8=AE=A1=E5=92=8C=E6=95=B0=E9=87=8F?= =?UTF-8?q?=E5=90=88=E8=AE=A1=E7=9A=84=E9=97=AE=E9=A2=98=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E9=94=80=E5=94=AE=E5=8F=91=E8=B5=B7=E5=87=BA=E8=B4=A7?= =?UTF-8?q?=E5=87=BA=E8=B4=A7=E9=80=9A=E7=9F=A5=E5=AD=90=E8=A1=A8=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E7=89=A9=E6=96=99=E5=9E=8B=E5=8F=B7=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98=20=E4=BF=AE=E5=A4=8D=E9=94=80=E5=94=AE=E5=8F=91?= =?UTF-8?q?=E8=B5=B7=E5=87=BA=E8=B4=A7=E4=BB=93=E5=BA=93=E5=87=BA=E5=BA=93?= =?UTF-8?q?=E5=8D=95=E5=AD=90=E8=A1=A8=E6=B2=A1=E6=9C=89=E7=89=A9=E6=96=99?= =?UTF-8?q?=E5=9E=8B=E5=8F=B7=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SysSalesOrderServiceImpl.java | 26 +++++++++++++++---- .../SysSalesShippingInformServiceImpl.java | 1 + .../impl/WarehouseOutOrderServiceImpl.java | 1 + .../system/salesOrder/salesDeliverGoods.html | 15 +++++++++++ 4 files changed, 38 insertions(+), 5 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesOrderServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesOrderServiceImpl.java index f086f72a..db199dbf 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesOrderServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesOrderServiceImpl.java @@ -298,10 +298,28 @@ public class SysSalesOrderServiceImpl implements ISysSalesOrderService */ @Override public int insertSysSalesOrder(SysSalesOrder sysSalesOrder){ + + + List sysSalesOrderChildList = sysSalesOrder.getSysSalesOrderChildList(); + + // 校验子表数据 + checkSysSalesOrderChildList(sysSalesOrder,sysSalesOrderChildList); + + + //数量合计 + int sumMaterialNum = sysSalesOrderChildList.stream().mapToInt(SysSalesOrderChild::getMaterialNum).sum(); + //物料合计 + int size = sysSalesOrderChildList.size(); + + String loginName = ShiroUtils.getLoginName(); sysSalesOrder.setCreateBy(loginName); sysSalesOrder.setCreateTime(DateUtils.getNowDate()); sysSalesOrder.setSalesOrderCode(getId()); + sysSalesOrder.setMaterialSum(sumMaterialNum); + sysSalesOrder.setEnterpriseSum(size); + + String commonCurrency = sysSalesOrder.getCommonCurrency(); if(RMB.equals(commonCurrency)){ sysSalesOrder.setConfirmTax("1"); @@ -315,10 +333,7 @@ public class SysSalesOrderServiceImpl implements ISysSalesOrderService if (s == 0){ return 0; } - List sysSalesOrderChildList = sysSalesOrder.getSysSalesOrderChildList(); - // 校验子表数据 - checkSysSalesOrderChildList(sysSalesOrder,sysSalesOrderChildList); for (int i = 0; i < s ;i++) { SysSalesOrderChild sysSalesOrderChild = sysSalesOrder.getSysSalesOrderChildList().get(i); @@ -348,7 +363,7 @@ public class SysSalesOrderServiceImpl implements ISysSalesOrderService throw new BusinessException("物料不含税单价美元不能为空"); } - + } // 检查物料数量是否为空 boolean anyMaterialNum = sysSalesOrderChildList.stream() .anyMatch(sysSalesOrderChild -> sysSalesOrderChild.getMaterialNum() == null); @@ -370,7 +385,7 @@ public class SysSalesOrderServiceImpl implements ISysSalesOrderService throw new BusinessException("质保天数不能为空"); } } - } + /** * 修改销售订单 @@ -592,6 +607,7 @@ public class SysSalesOrderServiceImpl implements ISysSalesOrderService if (hasApplyShippingNum == null) { hasApplyShippingNum = 0; // 确保 hasApplyShippingNum 不为 null } + if (hasApplyShippingNum+oldChild.getApplyShippingNum() > oldChild.getMaterialNum()){ throw new BusinessException("申请出货数与已申请出货数之和不能大于订单数量"); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesShippingInformServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesShippingInformServiceImpl.java index 10da0763..e83ec932 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesShippingInformServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesShippingInformServiceImpl.java @@ -276,6 +276,7 @@ public class SysSalesShippingInformServiceImpl implements ISysSalesShippingInfor sysSalesShippingInformDetail.setOutOrderCode(outOrderCode); sysSalesShippingInformDetail.setMaterialNo(sysSalesOrderChild.getMaterialCode()); sysSalesShippingInformDetail.setMaterialName(sysSalesOrderChild.getMaterialName()); + sysSalesShippingInformDetail.setMaterialModel(sysSalesOrderChild.getMaterialModel()); sysSalesShippingInformDetail.setMaterialType(sysSalesOrderChild.getMaterialType()); sysSalesShippingInformDetail.setMaterialBrand(sysSalesOrderChild.getBrand()); sysSalesShippingInformDetail.setMaterialUnit(sysSalesOrderChild.getUnit()); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseOutOrderServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseOutOrderServiceImpl.java index 97bd2485..f41ba2a8 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseOutOrderServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseOutOrderServiceImpl.java @@ -1114,6 +1114,7 @@ public class WarehouseOutOrderServiceImpl implements IWarehouseOutOrderService warehouseOutOrderDetail.setMaterialNo(sysSalesOrderChild.getMaterialCode()); warehouseOutOrderDetail.setMaterialName(sysSalesOrderChild.getMaterialName()); warehouseOutOrderDetail.setMaterialType(sysSalesOrderChild.getMaterialType()); + warehouseOutOrderDetail.setMaterialModel(sysSalesOrderChild.getMaterialModel()); warehouseOutOrderDetail.setMaterialBrand(sysSalesOrderChild.getBrand()); warehouseOutOrderDetail.setMaterialUnit(sysSalesOrderChild.getUnit()); warehouseOutOrderDetail.setMaterialDescribe(sysSalesOrderChild.getDescribe()); diff --git a/ruoyi-admin/src/main/resources/templates/system/salesOrder/salesDeliverGoods.html b/ruoyi-admin/src/main/resources/templates/system/salesOrder/salesDeliverGoods.html index 63c745f6..a156a2e1 100644 --- a/ruoyi-admin/src/main/resources/templates/system/salesOrder/salesDeliverGoods.html +++ b/ruoyi-admin/src/main/resources/templates/system/salesOrder/salesDeliverGoods.html @@ -121,6 +121,12 @@ var salesOrderIdList = [[${salesOrderIdList}]]; + var materialTypeDatas = [[${@category.getChildByCode('materialType')}]]; + var sysUnitClassDatas = [[${@dict.getType('sys_unit_class')}]]; + var processMethodDatas = [[${@dict.getType('processMethod')}]]; + + + var prefix = ctx + "system/salesOrder"; $("#form-salesDeliverGoods-edit").validate({ focusCleanup: true @@ -337,6 +343,9 @@ { title: '物料类型', field: 'materialType', + formatter: function(value, row, index) { + return $.table.selectCategoryLabel(materialTypeDatas, value); + } }, { title: '描述', @@ -345,6 +354,9 @@ { title: '单位', field: 'unit', + formatter: function(value, row, index) { + return $.table.selectDictLabel(sysUnitClassDatas, value); + } }, { title: '型号', @@ -358,6 +370,9 @@ { title: '加工方式', field: 'processMethod', + formatter: function(value, row, index) { + return $.table.selectDictLabel(processMethodDatas, value); + } }, { title: '订单数量',