From 8f64207032c6bcf7d2ff3f5a13ad507313d4ba85 Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Thu, 1 Aug 2024 10:56:03 +0800 Subject: [PATCH 01/15] =?UTF-8?q?[fix]=20=E9=87=87=E8=B4=AD=E7=AE=A1?= =?UTF-8?q?=E7=90=86=20=E5=85=88=E6=B3=A8=E9=87=8A=E6=8E=89=E9=87=87?= =?UTF-8?q?=E8=B4=AD=E8=AE=A2=E5=8D=95=E5=AE=A1=E6=A0=B8=E9=80=9A=E8=BF=87?= =?UTF-8?q?=E5=90=8E=E7=94=9F=E6=88=90=E5=BA=94=E6=94=B6=E8=B4=A6=E6=AC=BE?= =?UTF-8?q?=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/purchase/controller/PurchaseOrderController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/purchase/controller/PurchaseOrderController.java b/ruoyi-admin/src/main/java/com/ruoyi/purchase/controller/PurchaseOrderController.java index 7f84d501..0cabfd90 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/purchase/controller/PurchaseOrderController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/purchase/controller/PurchaseOrderController.java @@ -294,7 +294,7 @@ public class PurchaseOrderController extends BaseController if("submit".equals(instanceType)){ // 使用状态-是 purchaseOrderVo.setUseStatus("1"); - purchaseOrderService.addPurchaseOrderPayable(purchaseOrderVo); + //purchaseOrderService.addPurchaseOrderPayable(purchaseOrderVo); } // 作废 else if("cancel".equals(instanceType)){ From ccd0bf5b8bf5364f89d9dfef1c28b79a486adfd1 Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Thu, 1 Aug 2024 13:50:07 +0800 Subject: [PATCH 02/15] =?UTF-8?q?[feat]=20=E4=BB=93=E5=BA=93=E7=AE=A1?= =?UTF-8?q?=E7=90=86=20=E6=96=B0=E5=A2=9E=E4=BB=93=E5=BA=93=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E5=8D=95=EF=BC=9A=E4=BF=9D=E5=AD=98=E5=85=A5=E5=BA=93?= =?UTF-8?q?-=E9=87=87=E8=B4=AD=E5=8D=95(=E4=BB=93=E5=BA=93=E5=85=A5?= =?UTF-8?q?=E5=BA=93)=E5=90=8E=E7=AB=AF=E6=8E=A5=E5=8F=A3=E6=96=B9?= =?UTF-8?q?=E6=B3=95=20=E4=BF=AE=E6=94=B9=E5=85=A5=E5=BA=93-=E9=87=87?= =?UTF-8?q?=E8=B4=AD=E5=8D=95(=E4=BB=93=E5=BA=93=E5=85=A5=E5=BA=93)?= =?UTF-8?q?=E5=89=8D=E7=AB=AF=E9=A1=B5=E9=9D=A2=EF=BC=9A=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=96=B9=E6=B3=95=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=85=A5=E5=BA=93-=E9=87=87=E8=B4=AD=E5=8D=95(=E4=BB=93?= =?UTF-8?q?=E5=BA=93=E5=85=A5=E5=BA=93)=E8=AF=A6=E6=83=85=E5=89=8D?= =?UTF-8?q?=E7=AB=AF=E9=A1=B5=E9=9D=A2=EF=BC=9A=E4=BF=AE=E6=94=B9=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WarehouseStorageOrderController.java | 4 +- .../IWarehouseStorageOrderService.java | 5 ++ .../WarehouseStorageOrderServiceImpl.java | 75 +++++++++++++++++++ .../storagePurchaseWarehouse.html | 3 +- .../storagePurchaseWarehouseDetail.html | 2 +- 5 files changed, 85 insertions(+), 4 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/controller/WarehouseStorageOrderController.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/controller/WarehouseStorageOrderController.java index 76ad0a88..2614d158 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/controller/WarehouseStorageOrderController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/controller/WarehouseStorageOrderController.java @@ -384,8 +384,8 @@ public class WarehouseStorageOrderController extends BaseController @ResponseBody public AjaxResult storagePurchaseWarehouseSave(@RequestBody WarehouseStorageOrder warehouseStorageOrder) { - //暂时引用采购入库的保存方法 - return toAjax(warehouseStorageOrderService.updateStoragePurchaseSave(warehouseStorageOrder)); + + return toAjax(warehouseStorageOrderService.updateStoragePurchaseWarehouseSave(warehouseStorageOrder)); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/IWarehouseStorageOrderService.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/IWarehouseStorageOrderService.java index 6aaaec00..d2259f76 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/IWarehouseStorageOrderService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/IWarehouseStorageOrderService.java @@ -128,4 +128,9 @@ public interface IWarehouseStorageOrderService * 通过生产入库单品质后生成入库单 * */ int insertWarehouseStorageOrderByMakeQualityOrder(QualityOrder tempQualityOrder, List qualityOrderDetailList); + + /** + * 修改保存入库-采购单(仓库入库) + */ + int updateStoragePurchaseWarehouseSave(WarehouseStorageOrder warehouseStorageOrder); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseStorageOrderServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseStorageOrderServiceImpl.java index f8bdb4ea..0bd3e545 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseStorageOrderServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseStorageOrderServiceImpl.java @@ -432,6 +432,81 @@ public class WarehouseStorageOrderServiceImpl implements IWarehouseStorageOrderS } + + /** + * 修改保存入库-采购单(仓库入库) + */ + @Transactional(rollbackFor = Exception.class) + @Override + public int updateStoragePurchaseWarehouseSave(WarehouseStorageOrder warehouseStorageOrder) { + String loginName = ShiroUtils.getLoginName(); + + //假设全部入库 + warehouseStorageOrder.setWarehouseStorageStatus("4"); + warehouseStorageOrder.setUpdateBy(loginName); + warehouseStorageOrder.setUpdateTime(new Date()); + //记录一下入库时间 + warehouseStorageOrder.setStorageTime(new Date()); + List warehouseStorageOrderDetailList = warehouseStorageOrder.getWarehouseStorageOrderDetailList(); + if (StringUtils.isEmpty(warehouseStorageOrderDetailList)){ + log.warn("入库单详情数据为空:{}",warehouseStorageOrderDetailList); + throw new BusinessException("入库单详情数据为空"); + } + + //入库数 + Integer storageNum = 0; + + // 检查storageNum是否含有null值 + boolean hasThisStorageNumNull = warehouseStorageOrderDetailList.stream() + .anyMatch(item -> item.getStorageNum() == null); + + if (hasThisStorageNumNull) { + throw new BusinessException("存在入库数为空，请检查！"); + } + // 计算各个字段的总和 + storageNum = warehouseStorageOrderDetailList.stream() + .mapToInt(WarehouseStorageOrderDetail::getStorageNum) + .sum(); + + //插入主表入库数量 + warehouseStorageOrder.setStorageNum(storageNum); + //更新生产单数据 + int updateMakeOrderResult = sysMakeOrderService.updateSysMakeOrderByWarehouseStorageOrder(warehouseStorageOrder, warehouseStorageOrderDetailList); + if (updateMakeOrderResult <= 0){ + throw new BusinessException("更新生产订单失败，未影响任何行"); + } + + for (WarehouseStorageOrderDetail warehouseStorageOrderDetail : warehouseStorageOrderDetailList) { + //更新入库单详情的数据 + warehouseStorageOrderDetail.setUpdateBy(loginName); + warehouseStorageOrderDetail.setUpdateTime(new Date()); + //更新已入库数 + warehouseStorageOrderDetail.setHasStorageNum(warehouseStorageOrderDetail.getStorageNum()); + int updateWarehouseStorageOrderDetailResult = storageOrderDetailMapper.updateWarehouseStorageOrderDetail(warehouseStorageOrderDetail); + if (updateWarehouseStorageOrderDetailResult <= 0){ + throw new BusinessException("更新仓库入库单详情失败，未影响任何行"); + } + } + + //更新开发修改单数据 + String relatedOrderCode = warehouseStorageOrder.getRelatedOrderCode(); + ErpDevelopModifyorder erpDevelopModifyorder = developModifyorderMapper.selectErpDevelopModifyorderByCode(relatedOrderCode); + if (erpDevelopModifyorder != null){ + erpDevelopModifyorder.setPurchaseStorageStatus("8"); + developModifyorderMapper.updateErpDevelopModifyorder(erpDevelopModifyorder); + } + + + //更新入库单的数据 + int updateResult = warehouseStorageOrderMapper.updateWarehouseStorageOrder(warehouseStorageOrder); + + if (updateResult <= 0){ + log.warn("更新入库单失败，未影响任何行"); + } + return updateResult; + + } + /** * 通用入库单详情保存接口 * */ diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storagePurchaseWarehouse.html b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storagePurchaseWarehouse.html index b007e156..0c32ad0a 100644 --- a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storagePurchaseWarehouse.html +++ b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storagePurchaseWarehouse.html @@ -114,6 +114,7 @@ var materialDataList = tableData.map(function (item) { // 根据实际字段名调整 return { + "warehouseStorageDetailId":item.warehouseStorageDetailId, "supplierCode": item.supplierCode, "materialNo": item.materialNo, "materialName": item.materialName, @@ -151,7 +152,7 @@ // 使用 JSON.stringify() 序列化数据 const jsonData = JSON.stringify(combinedData); // 发送 AJAX 请求到后端接口 - $.operate.saveJson(prefix + "/temporaryPurchaseWarehouse", jsonData); + $.operate.saveJson(prefix + "/storagePurchaseWarehouse", jsonData); } $("input[name='arrivedTime']").datetimepicker({ diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storagePurchaseWarehouseDetail.html b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storagePurchaseWarehouseDetail.html index c498ee4d..12f10f4c 100644 --- a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storagePurchaseWarehouseDetail.html +++ b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storagePurchaseWarehouseDetail.html @@ -151,7 +151,7 @@ // 使用 JSON.stringify() 序列化数据 const jsonData = JSON.stringify(combinedData); // 发送 AJAX 请求到后端接口 - $.operate.saveJson(prefix + "/temporaryPurchaseWarehouse", jsonData); + $.operate.saveJson(prefix + "/storagePurchaseWarehouseDetail", jsonData); } $("input[name='arrivedTime']").datetimepicker({ From d19c814e5aee6f6ae79a2bcf61679badf7a9468d Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Thu, 1 Aug 2024 14:04:36 +0800 Subject: [PATCH 03/15] =?UTF-8?q?[fix]=20=E7=94=9F=E4=BA=A7=E7=AE=A1?= =?UTF-8?q?=E7=90=86=20=E4=BF=AE=E6=94=B9=E7=94=9F=E4=BA=A7=E9=A2=86?= =?UTF-8?q?=E6=96=99=E5=8D=95=E5=B7=A5=E7=A8=8B=E7=BB=8F=E7=90=86=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E9=A1=B5=E9=9D=A2=EF=BC=9A=E4=BF=AE=E6=94=B9=E5=AE=A1?= =?UTF-8?q?=E6=89=B9=E9=80=89=E9=A1=B9=E7=9A=84=E5=B8=83=E5=B1=80=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=9F=E4=BA=A7=E9=A2=86=E6=96=99=E5=8D=95?= =?UTF-8?q?=E5=B7=A5=E7=A8=8B=E4=B8=BB=E7=AE=A1=E5=AE=A1=E6=A0=B8=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=EF=BC=9A=E4=BF=AE=E6=94=B9=E5=AE=A1=E6=89=B9=E9=80=89?= =?UTF-8?q?=E9=A1=B9=E7=9A=84=E5=B8=83=E5=B1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/makeorderpick/taskScjlVerify.html | 16 +++++++++------- .../system/makeorderpick/taskSczgVerify.html | 15 ++++++++------- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/ruoyi-admin/src/main/resources/templates/system/makeorderpick/taskScjlVerify.html b/ruoyi-admin/src/main/resources/templates/system/makeorderpick/taskScjlVerify.html index fa8be71e..d2e1299b 100644 --- a/ruoyi-admin/src/main/resources/templates/system/makeorderpick/taskScjlVerify.html +++ b/ruoyi-admin/src/main/resources/templates/system/makeorderpick/taskScjlVerify.html @@ -56,13 +56,7 @@ - -
-
-
-
-
-
+
@@ -79,6 +73,14 @@
+ + +
+
+
+
+
+
diff --git a/ruoyi-admin/src/main/resources/templates/system/makeorderpick/taskSczgVerify.html b/ruoyi-admin/src/main/resources/templates/system/makeorderpick/taskSczgVerify.html index 20bb6d34..2a1604b6 100644 --- a/ruoyi-admin/src/main/resources/templates/system/makeorderpick/taskSczgVerify.html +++ b/ruoyi-admin/src/main/resources/templates/system/makeorderpick/taskSczgVerify.html @@ -56,13 +56,6 @@ - -
-
-
-
-
-
@@ -79,6 +72,14 @@
+ +
+
+
+
+
+
+ From 8be8900dd650fefc1afaa1f082fed8df83730972 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=99=93=E8=BF=AA?= <2596750866@qq.com> Date: Thu, 1 Aug 2024 14:51:50 +0800 Subject: [PATCH 04/15] =?UTF-8?q?[feat]=20=E9=94=80=E5=94=AE=E7=AE=A1?= =?UTF-8?q?=E7=90=86=20=E5=AE=A2=E6=88=B7=E8=B5=84=E6=96=99=20=E5=85=B6?= =?UTF-8?q?=E4=BB=96=E8=81=94=E7=B3=BB=E4=BA=BA=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E8=81=94=E7=B3=BB=E4=BA=BAmapper=EF=BC=8C=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E6=8C=89=E5=AE=A2=E6=88=B7=E4=BB=A3=E7=A0=81=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=9A=84=E6=96=B9=E6=B3=95=EF=BC=9B=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=81=94=E7=B3=BB=E4=BA=BAservice=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=EF=BC=8C=E6=96=B0=E5=A2=9E=E6=8C=89=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9F=A5=E8=AF=A2=E5=88=97=E8=A1=A8=E7=9A=84?= =?UTF-8?q?=E6=96=B9=E6=B3=95=EF=BC=9B=20=E9=94=80=E5=94=AE=E7=AE=A1?= =?UTF-8?q?=E7=90=86=20=E5=AE=A2=E6=88=B7=E8=B5=84=E6=96=99=20=E5=85=B6?= =?UTF-8?q?=E4=BB=96=E6=94=B6=E8=B4=A7=E5=9C=B0=E5=9D=80=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=85=B6=E4=BB=96=E6=94=B6=E8=B4=A7=E5=9C=B0=E5=9D=80?= =?UTF-8?q?mapper=EF=BC=8C=E6=96=B0=E5=A2=9E=E6=8C=89=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9F=A5=E8=AF=A2=E5=88=97=E8=A1=A8=E7=9A=84?= =?UTF-8?q?=E6=96=B9=E6=B3=95=EF=BC=9B=20=E4=BF=AE=E6=94=B9=E5=85=B6?= =?UTF-8?q?=E4=BB=96=E6=94=B6=E8=B4=A7=E5=9C=B0=E5=9D=80service=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=EF=BC=8C=E6=96=B0=E5=A2=9E=E6=8C=89=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9F=A5=E8=AF=A2=E5=88=97=E8=A1=A8=E7=9A=84?= =?UTF-8?q?=E6=96=B9=E6=B3=95=EF=BC=9B=20=E9=94=80=E5=94=AE=E7=AE=A1?= =?UTF-8?q?=E7=90=86=20=E5=AE=A2=E6=88=B7=E8=B5=84=E6=96=99=20=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E5=9F=BA=E6=9C=AC=E4=BF=A1=E6=81=AF=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=AE=A2=E6=88=B7=E4=BF=A1=E6=81=AF=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=EF=BC=8C=E6=96=B0=E5=A2=9E=E5=85=B3=E8=81=94?= =?UTF-8?q?=E8=81=94=E7=B3=BB=E4=BA=BA=E5=88=97=E8=A1=A8=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E8=A1=A8=E6=A0=BC=EF=BC=9B=20=E4=BF=AE=E6=94=B9=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E4=BF=A1=E6=81=AF=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=EF=BC=8C=E6=96=B0=E5=A2=9E=E5=85=B3=E8=81=94=E5=85=B6=E4=BB=96?= =?UTF-8?q?=E6=94=B6=E8=B4=A7=E5=9C=B0=E5=9D=80=E5=88=97=E8=A1=A8=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E8=A1=A8=E6=A0=BC=EF=BC=9B=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=AE=A2=E6=88=B7=E4=BF=A1=E6=81=AF=E8=AF=A6=E6=83=85=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E6=96=B0=E5=A2=9E=E5=85=B3=E8=81=94=E5=85=B6?= =?UTF-8?q?=E4=BB=96=E5=BC=80=E7=A5=A8=E4=BF=A1=E6=81=AF=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E8=A1=A8=E6=A0=BC=EF=BC=9B=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=AE=A2=E6=88=B7=E4=BF=A1=E6=81=AF=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E5=90=8E=E7=AB=AF=E6=8E=A5=E5=8F=A3=EF=BC=8C=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E8=AF=A5=E5=AE=A2=E6=88=B7=E4=BF=A1=E6=81=AF=E6=97=B6=E5=90=8C?= =?UTF-8?q?=E6=97=B6=E6=9F=A5=E8=AF=A2=E5=85=B6=E4=BB=96=E8=81=94=E7=B3=BB?= =?UTF-8?q?=E4=BA=BA=E3=80=81=E5=85=B6=E4=BB=96=E6=94=B6=E8=B4=A7=E5=9C=B0?= =?UTF-8?q?=E5=9D=80=E3=80=81=E5=85=B6=E4=BB=96=E5=BC=80=E7=A5=A8=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E9=99=84=E5=8A=A0=E5=88=B0=E9=A1=B5=E9=9D=A2=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SysCustomerController.java | 9 + .../system/mapper/SysContactsMapper.java | 7 + .../ruoyi/system/mapper/SysInvoiceMapper.java | 8 +- .../system/service/ISysContactsService.java | 8 + .../system/service/ISysInvoiceService.java | 8 + .../service/impl/SysContactsServiceImpl.java | 5 + .../service/impl/SysInvoiceServiceImpl.java | 5 + .../mapper/system/SysContactsMapper.xml | 7 +- .../mapper/system/SysInvoiceMapper.xml | 7 +- .../templates/system/customer/detail.html | 193 ++++++++++++++++++ 10 files changed, 254 insertions(+), 3 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysCustomerController.java b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysCustomerController.java index 234b2871..ea3bfdae 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysCustomerController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysCustomerController.java @@ -62,6 +62,8 @@ public class SysCustomerController extends BaseController @Autowired private ISysContactsService sysContactsService; @Autowired + private ISysInvoiceService sysInvoiceService; + @Autowired private ISysShippingAddressService sysShippingAddressService ; @Autowired private ISysDictTypeService sysDictTypeService; @@ -210,6 +212,13 @@ public class SysCustomerController extends BaseController public String detail(@PathVariable("id")Long id, ModelMap mmap) { SysCustomer sysCustomer = sysCustomerService.selectSysCustomerById(id); + String enterpriseCode = sysCustomer.getEnterpriseCode(); + List sysContacts = sysContactsService.selectSysContactsByCode(enterpriseCode); + List sysInvoices = sysInvoiceService.selectSysInvoiceByCode(enterpriseCode); + List shippingAddresses = sysShippingAddressService.selectSysShippingAddressByenterpriseCode(enterpriseCode); + mmap.put("contactsList",sysContacts); + mmap.put("invoicesList",sysInvoices); + mmap.put("shippingAddressList",shippingAddresses); mmap.put("sysCustomer", sysCustomer); return prefix + "/detail"; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysContactsMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysContactsMapper.java index 8203445e..777e6809 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysContactsMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysContactsMapper.java @@ -28,6 +28,13 @@ public interface SysContactsMapper */ List selectSysContactsList(SysContacts sysContacts); + /** + * 查询联系人明细列表 + * + * @param enterpriseCode 客户编号 + * @return 联系人明细集合 + */ + List selectSysContactsByCode(String enterpriseCode); /** * 新增联系人明细 * diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysInvoiceMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysInvoiceMapper.java index 3aac3bed..2329ab7b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysInvoiceMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysInvoiceMapper.java @@ -26,7 +26,13 @@ public interface SysInvoiceMapper * @return 其他开票信息集合 */ public List selectSysInvoiceList(SysInvoice sysInvoice); - + /** + * 查询其他开票信息列表 + * + * @param enterpriseCode 客户代码 + * @return 其他开票信息集合 + */ + public List selectSysInvoiceByCode(String enterpriseCode); /** * 新增其他开票信息 * diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysContactsService.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysContactsService.java index ca8af42f..48bd30c4 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysContactsService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysContactsService.java @@ -27,6 +27,14 @@ public interface ISysContactsService */ public List selectSysContactsList(SysContacts sysContacts); + /** + * 查询联系人明细列表 + * + * @param enterpriseCode 客户编号 + * @return 联系人明细集合 + */ + List selectSysContactsByCode(String enterpriseCode); + /** * 新增联系人明细 * diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysInvoiceService.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysInvoiceService.java index 6c1bc1fd..d2526bdc 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysInvoiceService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysInvoiceService.java @@ -27,6 +27,14 @@ public interface ISysInvoiceService */ public List selectSysInvoiceList(SysInvoice sysInvoice); + /** + * 查询其他开票信息列表 + * + * @param enterpriseCode 客户代码 + * @return 其他开票信息集合 + */ + public List selectSysInvoiceByCode(String enterpriseCode); + /** * 新增其他开票信息 * diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysContactsServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysContactsServiceImpl.java index b58b8d44..6c13c78e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysContactsServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysContactsServiceImpl.java @@ -48,6 +48,11 @@ public class SysContactsServiceImpl implements ISysContactsService return sysContactsMapper.selectSysContactsList(sysContacts); } + @Override + public List selectSysContactsByCode(String enterpriseCode) { + return sysContactsMapper.selectSysContactsByCode(enterpriseCode); + } + /** * 新增联系人明细 * diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysInvoiceServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysInvoiceServiceImpl.java index 4ea93805..e5bfc865 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysInvoiceServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysInvoiceServiceImpl.java @@ -51,6 +51,11 @@ public class SysInvoiceServiceImpl implements ISysInvoiceService return sysInvoiceMapper.selectSysInvoiceList(sysInvoice); } + @Override + public List selectSysInvoiceByCode(String enterpriseCode) { + return sysInvoiceMapper.selectSysInvoiceByCode(enterpriseCode); + } + /** * 新增其他开票信息 * diff --git a/ruoyi-admin/src/main/resources/mapper/system/SysContactsMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/SysContactsMapper.xml index fe960cb1..0be913d8 100644 --- a/ruoyi-admin/src/main/resources/mapper/system/SysContactsMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/system/SysContactsMapper.xml @@ -45,7 +45,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where contactid = #{contactid} - + + + insert into sys_contacts diff --git a/ruoyi-admin/src/main/resources/mapper/system/SysInvoiceMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/SysInvoiceMapper.xml index 61a8296c..645bac18 100644 --- a/ruoyi-admin/src/main/resources/mapper/system/SysInvoiceMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/system/SysInvoiceMapper.xml @@ -38,7 +38,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id} - + + + insert into sys_invoice diff --git a/ruoyi-admin/src/main/resources/templates/system/customer/detail.html b/ruoyi-admin/src/main/resources/templates/system/customer/detail.html index e0176a7d..e57e68c6 100644 --- a/ruoyi-admin/src/main/resources/templates/system/customer/detail.html +++ b/ruoyi-admin/src/main/resources/templates/system/customer/detail.html @@ -264,6 +264,24 @@
+
+ +
+
+
+
+
+ +
+
+
+
+
+ +
+
+
+
@@ -447,6 +465,181 @@ } ] }); + + // 其他联系人信息 + $('#contacts-table').bootstrapTable({ + data: [[${contactsList}]], + // pagination: true, + // pageNumber: 1, + // pageSize: 10, + // pageList: [10, 25, 50, 100], + maxHeight: 50, + modalName: "联系人明细", + columns: [ + { + field: 'contactid', + title: '联系人id', + visible: false, + }, + { + field: 'enterpriseCode', + title: '客户/企业代码', + visible: false, + }, + { + field: 'enterpriseName', + title: '客户/企业名称', + visible: false, + }, + { + field: 'customerName', + title: '姓名' + }, + { + field: 'customerPosition', + title: '职务' + }, + { + field: 'customerBirthday', + title: '生日' + }, + { + field: 'officeTelephone', + title: '办公电话' + }, + { + field: 'homePhone', + title: '家中电话' + }, + { + field: 'cellPhone', + title: '手机号' + }, + { + field: 'customerFax', + title: '传真' + }, + { + field: 'standbyTelephoneOne', + title: '备用电话1' + }, + { + field: 'standbyTelephoneTwo', + title: '备用电话2' + }, + { + field: 'commonEmail', + title: '常用Email' + }, + { + field: 'alternateEmail', + title: '备用Email' + }, + { + field: 'customerRemarks', + title: '备注' + }, + { + field: 'firstAddTime', + title: '录入时间', + formatter: function (value, row, index) { + if (value == null) { + return " "; + } else { + return value; + } + } + }, + { + field: 'updateInfoTime', + title: '上次修改时间', + formatter: function (value, row, index) { + if (value == null) { + return " "; + } else { + var vArr = value.split(',') + return vArr[0]; + } + } + }, + ] + }); + + // 其他收货地址 + $('#shippingaddress-table').bootstrapTable({ + data: [[${shippingAddressList}]], + // pagination: true, + // pageNumber: 1, + // pageSize: 10, + // pageList: [10, 25, 50, 100], + maxHeight: 50, + modalName: "收货地址明细", + columns: [ + {title: '送货id',field: 'deliveryId',visible:false}, + {title: '客户/企业代码',field: 'enterpriseCode',visible:false}, + {title: '客户/企业名称',field: 'enterpriseName',visible:false}, + {title: '联系人电话',field: 'customerPhone'}, + {title: '联系人',field: 'customerName'}, + {title: '送货地址',field: 'deliveryAddress'}, + {title: '联系人2',field: 'customerNameTwo'}, + {title: '详细描述',field: 'detailedDescription'}, + {title: '厂区',field: 'plantArea'}, + {title: '邮编',field: 'postalCode'}, + {title: '传真',field: 'customerFax'}, + {title: '录入时间',field: 'firstAddTime', + formatter: function (value, row, index) {if (value == null) {return " ";}else {return value;}} + }, + {title: '上次修改时间',field: 'updateInfoTime', + formatter: function (value, row, index) {if (value == null) {return " ";} else {var vArr = value.split(','); return vArr[0];}} + }, + ] + }); + + // 其他开票信息 + $('#invoice-table').bootstrapTable({ + data: [[${invoicesList}]], + // pagination: true, + // pageNumber: 1, + // pageSize: 10, + // pageList: [10, 25, 50, 100], + maxHeight: 50, + modalName: "开票信息", + columns: [ + { + title: '开票索引编号', + field: 'id', + visible: false + }, + { + title: '开票ID', + field: 'invoiceId', + }, + { + title: '企业代码', + field: 'enterpriseCode', + }, + { + title: '企业名称', + field: 'enterpriseName', + }, + { + title: '开票公司名称', + field: 'invoiceCompanyName', + }, + { + title: '开票公司税号', + field: 'invoiceCompanyCode', + }, + { + title: '公司开户行', + field: 'depositBank', + }, + { + title: '公司开户账号', + field: 'bankAccount', + }, + ] + }); \ No newline at end of file From 110d3074866912afc38071f0580d85bcc2d287c8 Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Thu, 1 Aug 2024 15:54:37 +0800 Subject: [PATCH 05/15] =?UTF-8?q?[fix]=20=E5=94=AE=E5=90=8E=E7=AE=A1?= =?UTF-8?q?=E7=90=86=20=E4=BF=AE=E6=94=B9=E5=94=AE=E5=90=8E=E5=87=BA?= =?UTF-8?q?=E8=B4=A7=E8=AE=BE=E5=A4=87=E5=AE=9E=E4=BD=93=E7=B1=BB=EF=BC=9A?= =?UTF-8?q?=20=E5=87=BA=E5=8E=82=E6=97=A5=E6=9C=9F=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E3=80=81=E9=94=81=E6=9C=BA=E6=97=B6=E9=97=B4=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E3=80=81=E6=8D=9F=E8=80=97=E5=93=81=E5=88=B0=E6=9C=9F=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E7=B1=BB=E5=9E=8B=E3=80=81=E4=BA=8C=E6=AC=A1=E7=BB=B4?= =?UTF-8?q?=E4=BF=AE=E5=90=8E=E9=83=A8=E4=BB=B6=E8=B4=A8=E4=BF=9D=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E7=B1=BB=E5=9E=8B=E7=94=B1String->date=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=94=AE=E5=90=8E=E5=87=BA=E8=B4=A7=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E9=A1=B5=E9=9D=A2=E5=AE=9E=E4=BD=93=E7=B1=BB?= =?UTF-8?q?=EF=BC=9A=20=E5=87=BA=E5=8E=82=E6=97=A5=E6=9C=9F=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E3=80=81=E9=94=81=E6=9C=BA=E6=97=B6=E9=97=B4=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E3=80=81=E6=8D=9F=E8=80=97=E5=93=81=E5=88=B0=E6=9C=9F?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E7=B1=BB=E5=9E=8B=E3=80=81=E4=BA=8C=E6=AC=A1?= =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E5=90=8E=E9=83=A8=E4=BB=B6=E8=B4=A8=E4=BF=9D?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E7=B1=BB=E5=9E=8B=E7=94=B1String->date=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=94=AE=E5=90=8E=E5=87=BA=E8=B4=A7=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E7=BC=96=E8=BE=91=E9=A1=B5=E9=9D=A2=E5=94=AE=E5=90=8E?= =?UTF-8?q?=E5=92=8C=E4=BB=93=E5=BA=93=E5=AE=9E=E4=BD=93=E7=B1=BB=EF=BC=9A?= =?UTF-8?q?=20=E5=87=BA=E5=8E=82=E6=97=A5=E6=9C=9F=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E3=80=81=E9=94=81=E6=9C=BA=E6=97=B6=E9=97=B4=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E3=80=81=E6=8D=9F=E8=80=97=E5=93=81=E5=88=B0=E6=9C=9F=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E7=B1=BB=E5=9E=8B=E3=80=81=E4=BA=8C=E6=AC=A1=E7=BB=B4?= =?UTF-8?q?=E4=BF=AE=E5=90=8E=E9=83=A8=E4=BB=B6=E8=B4=A8=E4=BF=9D=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E7=B1=BB=E5=9E=8B=E7=94=B1String->date=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=B7=BB=E5=8A=A0=E5=87=BA=E8=B4=A7=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E6=97=B6=E6=96=B0=E5=A2=9E=E5=87=BA=E8=B4=A7=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=AE=9E=E4=BD=93=E7=B1=BB=EF=BC=9A=20?= =?UTF-8?q?=E5=87=BA=E5=8E=82=E6=97=A5=E6=9C=9F=E7=B1=BB=E5=9E=8B=E3=80=81?= =?UTF-8?q?=E9=94=81=E6=9C=BA=E6=97=B6=E9=97=B4=E7=B1=BB=E5=9E=8B=E3=80=81?= =?UTF-8?q?=E6=8D=9F=E8=80=97=E5=93=81=E5=88=B0=E6=9C=9F=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E3=80=81=E4=BA=8C=E6=AC=A1=E7=BB=B4=E4=BF=AE?= =?UTF-8?q?=E5=90=8E=E9=83=A8=E4=BB=B6=E8=B4=A8=E4=BF=9D=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E7=94=B1String->date=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=87=BA=E8=B4=A7=E8=AE=BE=E5=A4=87=E6=9F=A5=E6=89=BE=E5=87=BA?= =?UTF-8?q?=E8=B4=A7=E8=AE=BE=E5=A4=87=E4=BB=93=E5=BA=93=E5=92=8C=E5=94=AE?= =?UTF-8?q?=E5=90=8EDto=EF=BC=8C=E6=96=B0=E5=A2=9E=E4=BB=93=E5=BA=93?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E4=BF=A1=E6=81=AF=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=94=AE=E5=90=8E=E7=BB=B4=E6=8A=A4=E8=AE=BE=E5=A4=87=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E9=A1=B5=E9=9D=A2=EF=BC=9A=E6=96=B0=E5=A2=9E=E4=BB=93?= =?UTF-8?q?=E5=BA=93=E7=9B=B8=E5=85=B3=E5=AD=97=E6=AE=B5=EF=BC=8C=E5=A4=84?= =?UTF-8?q?=E7=90=86=E6=97=A5=E6=9C=9F=E7=B1=BB=E5=9E=8B=E7=9A=84=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=20=E4=BF=AE=E6=94=B9=E5=94=AE=E5=90=8E=E7=BB=B4?= =?UTF-8?q?=E6=8A=A4=E8=AE=BE=E5=A4=87=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=EF=BC=9A=E6=96=B0=E5=A2=9E=E4=BB=93=E5=BA=93=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=EF=BC=8C=E5=A4=84=E7=90=86=E6=97=A5=E6=9C=9F?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E7=9A=84=E6=95=B0=E6=8D=AE=EF=BC=8C=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E5=8A=A0=E4=B8=8Adisabled=E5=85=B3=E9=94=AE=E5=AD=97?= =?UTF-8?q?=20=E4=BF=AE=E6=94=B9=E5=94=AE=E5=90=8E=E7=BB=B4=E6=8A=A4?= =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2=EF=BC=9A?= =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=96=B0=E5=A2=9E=E3=80=81=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E3=80=81=E5=88=A0=E9=99=A4=E3=80=81=E5=AF=BC=E5=87=BA=E6=8C=89?= =?UTF-8?q?=E9=92=AE=20=E4=BF=AE=E6=94=B9=E5=AE=A2=E6=88=B7=E8=B5=84?= =?UTF-8?q?=E6=96=99=E7=9A=84=E9=80=9A=E8=BF=87=E5=AE=A2=E6=88=B7=E7=BC=96?= =?UTF-8?q?=E7=A0=81=E6=9F=A5=E6=89=BE=E5=AE=A2=E6=88=B7=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=96=B9=E6=B3=95=EF=BC=9A=E6=96=B0=E5=A2=9E=E5=AF=B9=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E8=B5=84=E6=96=99=E5=88=A4=E7=A9=BA=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=20=E6=96=B0=E5=A2=9E=E6=A0=B9=E6=8D=AE=E5=87=BA=E8=B4=A7?= =?UTF-8?q?=E8=AE=BE=E5=A4=87Id=E6=9F=A5=E6=89=BE=E4=BB=93=E5=BA=93?= =?UTF-8?q?=E5=87=BA=E5=BA=93=E5=8D=95=E6=95=B0=E6=8D=AE=E5=90=8E=E7=AB=AF?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=96=B9=E6=B3=95=20=E5=87=BA=E8=B4=A7?= =?UTF-8?q?=E8=AE=BE=E5=A4=87Controller=E5=B1=82=E6=96=B0=E5=A2=9E=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BF=9D=E5=AD=98=E5=87=BA=E8=B4=A7=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AfterSalesShippingDeviceController.java | 11 +++ .../domain/AfterSalesShippingDevice.java | 24 +++--- .../dto/AfterSalesShippingDeviceEditDto.java | 8 +- .../domain/dto/WarehouseAndAfterSalesDto.java | 14 +++- .../domain/vo/SelectShippingDeviceVO.java | 11 ++- .../IAfterSalesShippingDeviceService.java | 4 + .../AfterSalesShippingDeviceServiceImpl.java | 22 +++++ .../service/impl/SysCustomerServiceImpl.java | 14 ++-- .../mapper/WarehouseOutOrderMapper.java | 7 ++ .../warehouse/WarehouseOutOrderMapper.xml | 6 +- .../aftersales/shippingDevice/detail.html | 83 +++++++++++-------- .../aftersales/shippingDevice/edit.html | 33 +++++--- .../shippingDevice/shippingDevice.html | 15 ---- 13 files changed, 162 insertions(+), 90 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/controller/AfterSalesShippingDeviceController.java b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/controller/AfterSalesShippingDeviceController.java index 10631c98..9d35457f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/controller/AfterSalesShippingDeviceController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/controller/AfterSalesShippingDeviceController.java @@ -165,6 +165,17 @@ public class AfterSalesShippingDeviceController extends BaseController + /** + * 修改保存出货设备详情 + */ + @ResponseBody + @PostMapping("/detail") + public AjaxResult detailSave(@RequestBody AfterSalesShippingDeviceEditDto dto) + { + return toAjax(afterSalesShippingDeviceService.detailSaveAfterSalesShippingDevice(dto)); + } + + /** * 作废出货设备 */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/domain/AfterSalesShippingDevice.java b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/domain/AfterSalesShippingDevice.java index 6bf4cece..8a61af4c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/domain/AfterSalesShippingDevice.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/domain/AfterSalesShippingDevice.java @@ -92,7 +92,7 @@ public class AfterSalesShippingDevice extends BaseEntity /** 出厂日期 */ @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "出厂日期", width = 30, dateFormat = "yyyy-MM-dd") - private String factoryDate; + private Date factoryDate; /** 保修期 */ @Excel(name = "保修期") @@ -105,7 +105,7 @@ public class AfterSalesShippingDevice extends BaseEntity /** 锁机时间 */ @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "锁机时间", width = 30, dateFormat = "yyyy-MM-dd") - private String lockDate; + private Date lockDate; /** 是否有锁机时间 */ @Excel(name = "是否有锁机时间") @@ -114,7 +114,7 @@ public class AfterSalesShippingDevice extends BaseEntity /** 损耗品到期时间 */ @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "损耗品到期时间", width = 30, dateFormat = "yyyy-MM-dd") - private String wastageExpireDate; + private Date wastageExpireDate; /** 是否过损耗品到期时间 */ @Excel(name = "是否过损耗品到期时间") @@ -123,7 +123,7 @@ public class AfterSalesShippingDevice extends BaseEntity /** 二次维修后部件质保时间 */ @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "二次维修后部件质保时间", width = 30, dateFormat = "yyyy-MM-dd") - private String componentGuaranteeDate; + private Date componentGuaranteeDate; /** 是否过二次维修后部件质保日期 */ @Excel(name = "是否过二次维修后部件质保日期") @@ -425,35 +425,35 @@ public class AfterSalesShippingDevice extends BaseEntity return maintainOrderCode; } - public String getFactoryDate() { + public Date getFactoryDate() { return factoryDate; } - public void setFactoryDate(String factoryDate) { + public void setFactoryDate(Date factoryDate) { this.factoryDate = factoryDate; } - public String getLockDate() { + public Date getLockDate() { return lockDate; } - public void setLockDate(String lockDate) { + public void setLockDate(Date lockDate) { this.lockDate = lockDate; } - public String getWastageExpireDate() { + public Date getWastageExpireDate() { return wastageExpireDate; } - public void setWastageExpireDate(String wastageExpireDate) { + public void setWastageExpireDate(Date wastageExpireDate) { this.wastageExpireDate = wastageExpireDate; } - public String getComponentGuaranteeDate() { + public Date getComponentGuaranteeDate() { return componentGuaranteeDate; } - public void setComponentGuaranteeDate(String componentGuaranteeDate) { + public void setComponentGuaranteeDate(Date componentGuaranteeDate) { this.componentGuaranteeDate = componentGuaranteeDate; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/domain/dto/AfterSalesShippingDeviceEditDto.java b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/domain/dto/AfterSalesShippingDeviceEditDto.java index 42be5b48..8009985e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/domain/dto/AfterSalesShippingDeviceEditDto.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/domain/dto/AfterSalesShippingDeviceEditDto.java @@ -79,23 +79,23 @@ public class AfterSalesShippingDeviceEditDto { @JsonFormat(pattern = "yyyy-MM-dd") @JsonProperty("factoryDate") - private String factoryDate; + private Date factoryDate; @JsonProperty("guaranteePeriod") private String guaranteePeriod; @JsonFormat(pattern = "yyyy-MM-dd") @JsonProperty("lockDate") - private String lockDate; + private Date lockDate; @JsonProperty("lockDateFlag") private String lockDateFlag; @JsonFormat(pattern = "yyyy-MM-dd") @JsonProperty("wastageExpireDate") - private String wastageExpireDate; + private Date wastageExpireDate; @JsonFormat(pattern = "yyyy-MM-dd") @JsonProperty("componentGuaranteeDate") - private String componentGuaranteeDate; + private Date componentGuaranteeDate; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/domain/dto/WarehouseAndAfterSalesDto.java b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/domain/dto/WarehouseAndAfterSalesDto.java index c95d027e..7cfede33 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/domain/dto/WarehouseAndAfterSalesDto.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/domain/dto/WarehouseAndAfterSalesDto.java @@ -9,6 +9,12 @@ import java.util.Date; @Data public class WarehouseAndAfterSalesDto { + @JsonProperty("outOrderCode") + private String outOrderCode; + + @JsonProperty("warehouseName") + private String warehouseName; + @JsonProperty("snCode") private String snCode; @@ -17,24 +23,24 @@ public class WarehouseAndAfterSalesDto { @JsonFormat(pattern = "yyyy-MM-dd") @JsonProperty("factoryDate") - private String factoryDate; + private Date factoryDate; @JsonProperty("guaranteePeriod") private String guaranteePeriod; @JsonFormat(pattern = "yyyy-MM-dd") @JsonProperty("lockDate") - private String lockDate; + private Date lockDate; @JsonProperty("lockDateFlag") private String lockDateFlag; @JsonFormat(pattern = "yyyy-MM-dd") @JsonProperty("wastageExpireDate") - private String wastageExpireDate; + private Date wastageExpireDate; @JsonFormat(pattern = "yyyy-MM-dd") @JsonProperty("componentGuaranteeDate") - private String componentGuaranteeDate; + private Date componentGuaranteeDate; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/domain/vo/SelectShippingDeviceVO.java b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/domain/vo/SelectShippingDeviceVO.java index cc4125b1..06eeee72 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/domain/vo/SelectShippingDeviceVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/domain/vo/SelectShippingDeviceVO.java @@ -3,6 +3,9 @@ package com.ruoyi.aftersales.domain.vo; import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.annotation.Excel; import lombok.Data; + +import java.util.Date; + /** * 添加出货设备时新增出货设备列表 */ @@ -23,22 +26,22 @@ public class SelectShippingDeviceVO { private String snCode; /** 出厂日期 */ - private String factoryDate; + private Date factoryDate; /** 保修期 */ private String guaranteePeriod; /** 锁机时间 */ - private String lockDate; + private Date lockDate; /** 是否有锁机时间 */ private String lockDateFlag; /** 损耗品到期时间 */ - private String wastageExpireDate; + private Date wastageExpireDate; /** 二次维修后部件质保时间 */ - private String componentGuaranteeDate; + private Date componentGuaranteeDate; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/IAfterSalesShippingDeviceService.java b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/IAfterSalesShippingDeviceService.java index a8ebd7b3..18e68589 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/IAfterSalesShippingDeviceService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/IAfterSalesShippingDeviceService.java @@ -103,4 +103,8 @@ public interface IAfterSalesShippingDeviceService * */ List selectAfterSalesShippingDeviceByNoAndCode(AfterSalesShippingDevice afterSalesShippingDevice); + /** + * 保存出货设备详情 + * */ + int detailSaveAfterSalesShippingDevice(AfterSalesShippingDeviceEditDto dto); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/impl/AfterSalesShippingDeviceServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/impl/AfterSalesShippingDeviceServiceImpl.java index 6ee1932f..e6223b7a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/impl/AfterSalesShippingDeviceServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/service/impl/AfterSalesShippingDeviceServiceImpl.java @@ -17,6 +17,8 @@ import com.ruoyi.sales.domain.SalesAftersalesNotice; import com.ruoyi.sales.domain.SalesAftersalesNoticeDetail; import com.ruoyi.sales.mapper.SalesAftersalesNoticeDetailMapper; import com.ruoyi.system.dto.SysEquipDetailDto; +import com.ruoyi.warehouse.domain.WarehouseOutOrder; +import com.ruoyi.warehouse.mapper.WarehouseOutOrderMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.aftersales.mapper.AfterSalesShippingDeviceMapper; @@ -44,6 +46,9 @@ public class AfterSalesShippingDeviceServiceImpl implements IAfterSalesShippingD @Autowired private SalesAftersalesNoticeDetailMapper aftersalesNoticeDetailMapper; + @Autowired + private WarehouseOutOrderMapper warehouseOutOrderMapper; + /** * 查询出货设备 * @@ -102,6 +107,14 @@ public class AfterSalesShippingDeviceServiceImpl implements IAfterSalesShippingD public WarehouseAndAfterSalesDto selectWarehouseAndAfterSalesDtoById(Long shippingDeviceCode) { WarehouseAndAfterSalesDto warehouseAndAfterSalesDto = new WarehouseAndAfterSalesDto(); AfterSalesShippingDevice afterSalesShippingDevice = afterSalesShippingDeviceMapper.selectAfterSalesShippingDeviceById(shippingDeviceCode); + //查找仓库信息 + WarehouseOutOrder warehouseOutOrder = warehouseOutOrderMapper.selectWarehouseOutOrderByShippingDeviceId(afterSalesShippingDevice.getShippingDeviceId()); + if (StringUtils.isNotNull(warehouseOutOrder)){ + warehouseAndAfterSalesDto.setOutOrderCode(warehouseOutOrder.getOutOrderCode()); + warehouseAndAfterSalesDto.setWarehouseName(warehouseOutOrder.getWarehouseName()); + } + + //查找出货设备信息 if (StringUtils.isNotNull(afterSalesShippingDevice)){ warehouseAndAfterSalesDto.setFactoryDate(afterSalesShippingDevice.getFactoryDate()); warehouseAndAfterSalesDto.setLockDate(afterSalesShippingDevice.getLockDate()); @@ -227,4 +240,13 @@ public class AfterSalesShippingDeviceServiceImpl implements IAfterSalesShippingD } return sysEquipDetailDtos; } + + + /** + * 保存出货设备详情 + * */ + @Override + public int detailSaveAfterSalesShippingDevice(AfterSalesShippingDeviceEditDto dto) { + return 1; + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerServiceImpl.java index ece5585c..b15d6d3b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerServiceImpl.java @@ -229,12 +229,14 @@ public class SysCustomerServiceImpl implements ISysCustomerService public CustomerDto selectCustomerDtoByEnterpriseCode(String customerId) { CustomerDto customerDto = new CustomerDto(); SysCustomer sysCustomer = sysCustomerMapper.selectSysCustomerByEnterpriseCode(customerId); - customerDto.setContactNumber(sysCustomer.getContactNumber()); - customerDto.setCustomerAddress(sysCustomer.getCustomerAddress()); - customerDto.setEnterpriseCode(sysCustomer.getEnterpriseCode()); - customerDto.setEnterpriseName(sysCustomer.getEnterpriseName()); - customerDto.setDeliveryAddress(sysCustomer.getDeliveryAddress()); - customerDto.setCustomerContact(sysCustomer.getCustomerContact()); + if(sysCustomer != null){ + customerDto.setContactNumber(sysCustomer.getContactNumber()); + customerDto.setCustomerAddress(sysCustomer.getCustomerAddress()); + customerDto.setEnterpriseCode(sysCustomer.getEnterpriseCode()); + customerDto.setEnterpriseName(sysCustomer.getEnterpriseName()); + customerDto.setDeliveryAddress(sysCustomer.getDeliveryAddress()); + customerDto.setCustomerContact(sysCustomer.getCustomerContact()); + } return customerDto; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/mapper/WarehouseOutOrderMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/mapper/WarehouseOutOrderMapper.java index df447fae..5960c0fc 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/mapper/WarehouseOutOrderMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/mapper/WarehouseOutOrderMapper.java @@ -97,4 +97,11 @@ public interface WarehouseOutOrderMapper * 根据出库单号查询出库单数据 * */ WarehouseOutOrder selectWarehouseOutOrderByCode(String outOrderCode); + + /* + * 根据出货设备Id查找仓库出库单数据 + * + * */ + WarehouseOutOrder selectWarehouseOutOrderByShippingDeviceId(String shippingDeviceId); + } diff --git a/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseOutOrderMapper.xml b/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseOutOrderMapper.xml index ea0c1aa5..be21c038 100644 --- a/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseOutOrderMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseOutOrderMapper.xml @@ -97,8 +97,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where out_order_code = #{outOrderCode} + + - insert into warehouse_out_order diff --git a/ruoyi-admin/src/main/resources/templates/aftersales/shippingDevice/detail.html b/ruoyi-admin/src/main/resources/templates/aftersales/shippingDevice/detail.html index f363e77e..95e74f4f 100644 --- a/ruoyi-admin/src/main/resources/templates/aftersales/shippingDevice/detail.html +++ b/ruoyi-admin/src/main/resources/templates/aftersales/shippingDevice/detail.html @@ -11,61 +11,61 @@
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -77,37 +77,37 @@
- +
- +
- +
- +
- +
- +
@@ -120,25 +120,25 @@
- +
- +
- +
- +
@@ -149,23 +149,35 @@

仓库和售后信息

+
+ +
+ +
+
+
+ +
+ +
+
- +
- +
- +
@@ -173,31 +185,34 @@
- +
+
-
- - +
+ +
+
- +
- +
+ + +
- +
@@ -206,7 +221,7 @@
- +
@@ -242,7 +257,7 @@ // 使用 JSON.stringify() 序列化数据 const jsonData = JSON.stringify(combinedData); // 发送 AJAX 请求到后端接口 - $.operate.saveJson(prefix + "/edit", jsonData); + $.operate.saveJson(prefix + "/detail", jsonData); } } diff --git a/ruoyi-admin/src/main/resources/templates/aftersales/shippingDevice/edit.html b/ruoyi-admin/src/main/resources/templates/aftersales/shippingDevice/edit.html index 458a87bc..d1f3c3fa 100644 --- a/ruoyi-admin/src/main/resources/templates/aftersales/shippingDevice/edit.html +++ b/ruoyi-admin/src/main/resources/templates/aftersales/shippingDevice/edit.html @@ -149,6 +149,18 @@

仓库和售后信息

+
+ +
+ +
+
+
+ +
+ +
+
@@ -165,7 +177,7 @@
- +
@@ -179,25 +191,26 @@
-
- - +
+ +
- +
- +
+ + +
- +
@@ -206,7 +219,7 @@
- +
diff --git a/ruoyi-admin/src/main/resources/templates/aftersales/shippingDevice/shippingDevice.html b/ruoyi-admin/src/main/resources/templates/aftersales/shippingDevice/shippingDevice.html index eb6d9100..2b2624e3 100644 --- a/ruoyi-admin/src/main/resources/templates/aftersales/shippingDevice/shippingDevice.html +++ b/ruoyi-admin/src/main/resources/templates/aftersales/shippingDevice/shippingDevice.html @@ -108,21 +108,6 @@
- - - - - - - - - - - - - - -
From f134f3b5685b95c9e02892c2b7632278753443a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=99=93=E8=BF=AA?= <2596750866@qq.com> Date: Thu, 1 Aug 2024 16:42:31 +0800 Subject: [PATCH 06/15] =?UTF-8?q?[fix]=20=E5=B7=A5=E7=A8=8B=E7=AE=A1?= =?UTF-8?q?=E7=90=86=20bom=E4=BF=A1=E6=81=AF=20=E4=BF=AE=E6=94=B9=E7=BC=96?= =?UTF-8?q?=E8=BE=91bom=E9=A1=B5=E9=9D=A2=E6=8F=90=E4=BA=A4=E8=A1=A8?= =?UTF-8?q?=E5=8D=95=E6=96=B9=E6=B3=95=EF=BC=8C=E5=B0=86=E5=90=AB=E6=9C=89?= =?UTF-8?q?disabled=E5=B1=9E=E6=80=A7=E7=9A=84select=E5=85=83=E7=B4=A0?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=89=8D=E5=8E=BB=E9=99=A4=E8=AF=A5=E5=B1=9E?= =?UTF-8?q?=E6=80=A7=EF=BC=9B=20=E4=BF=AE=E6=94=B9=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E5=90=8E=E7=AB=AF=E6=8E=A5=E5=8F=A3=EF=BC=8C=E6=9B=B4=E6=94=B9?= =?UTF-8?q?=E4=BF=9D=E5=AD=98=E7=BC=96=E8=BE=91=E6=95=B0=E6=8D=AE=E3=80=81?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=AE=A1=E6=A0=B8=E6=96=B9=E6=B3=95=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ruoyi/erp/controller/ErpBomController.java | 2 +- ruoyi-admin/src/main/resources/templates/erp/bom/edit.html | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/erp/controller/ErpBomController.java b/ruoyi-admin/src/main/java/com/ruoyi/erp/controller/ErpBomController.java index 017531af..44c5d89f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/erp/controller/ErpBomController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/erp/controller/ErpBomController.java @@ -343,7 +343,7 @@ public class ErpBomController extends BaseController erpBom.setUseStatus("0"); // 审核状态-待审核 erpBom.setAuditStatus("0"); - erpBomService.submitApply(erpBom); + erpBomService.submitUpdateApply(erpBom); return AjaxResult.success(); } diff --git a/ruoyi-admin/src/main/resources/templates/erp/bom/edit.html b/ruoyi-admin/src/main/resources/templates/erp/bom/edit.html index c9394a4c..f9572aaf 100644 --- a/ruoyi-admin/src/main/resources/templates/erp/bom/edit.html +++ b/ruoyi-admin/src/main/resources/templates/erp/bom/edit.html @@ -63,7 +63,7 @@
- +
@@ -120,6 +120,9 @@ function submitHandler() { if ($.validate.form()) { $("#selectEngineer").removeAttr("disabled"); + $("#selectMaterialType").removeAttr("disabled"); + $("#selectProcessMethod").removeAttr("disabled"); + $("#selectUnit").removeAttr("disabled"); var formData = $("#form-bom-edit").serializeArray(); console.log("formData",formData); var tableData = $("#bootstrap-sub-table-1").bootstrapTable('getData'); From cfbe873cb546c4927bb74bda01782a96f0f93e6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=99=93=E8=BF=AA?= <2596750866@qq.com> Date: Thu, 1 Aug 2024 16:46:17 +0800 Subject: [PATCH 07/15] =?UTF-8?q?[feat]=20=E5=B7=A5=E7=A8=8B=E7=AE=A1?= =?UTF-8?q?=E7=90=86=20bom=E4=BF=A1=E6=81=AF=20service=E5=8F=8A=E5=85=B6?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=96=B0=E5=A2=9E=E4=BF=9D=E5=AD=98=E7=BC=96?= =?UTF-8?q?=E8=BE=91bom=E4=BF=A1=E6=81=AF=E5=90=8E=E5=90=AF=E5=8A=A8?= =?UTF-8?q?=E5=AE=A1=E6=89=B9=E6=B5=81=E7=A8=8B=E7=9A=84=E6=96=B9=E6=B3=95?= =?UTF-8?q?=EF=BC=9B=20[fix]=20=E4=BF=AE=E6=94=B9=E6=9B=B4=E6=96=B0bom?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=96=B9=E6=B3=95=EF=BC=8C=E6=9B=B4=E6=94=B9?= =?UTF-8?q?=E4=BC=A0=E5=8F=82=E7=B1=BB=E5=9E=8B=E4=B8=BAErpBom=E7=B1=BB?= =?UTF-8?q?=EF=BC=9B=20=E4=BF=AE=E6=94=B9=E6=B7=BB=E5=8A=A0bom=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=AD=90=E7=BB=84=E4=BB=B6=E6=9B=B4=E6=96=B0=E6=96=B9?= =?UTF-8?q?=E6=B3=95=EF=BC=8C=E5=85=88=E6=8C=89=E7=88=B6id=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E8=AE=B0=E5=BD=95=E5=90=8E=E5=86=8D=E6=8F=92=E5=85=A5?= =?UTF-8?q?=E8=A6=81=E6=9B=B4=E6=96=B0=E7=9A=84=E6=95=B0=E6=8D=AE=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/erp/service/IErpBomService.java | 7 ++- .../erp/service/impl/ErpBomServiceImpl.java | 52 +++++++++++++++---- 2 files changed, 48 insertions(+), 11 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/erp/service/IErpBomService.java b/ruoyi-admin/src/main/java/com/ruoyi/erp/service/IErpBomService.java index 0405206a..f5759150 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/erp/service/IErpBomService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/erp/service/IErpBomService.java @@ -61,10 +61,10 @@ public interface IErpBomService /** * 修改bom * - * @param erpBomVo bom + * @param erpBom bom * @return 结果 */ - public int updateErpBom(ErpBomVo erpBomVo); + public int updateErpBom(ErpBom erpBom); /** * 批量删除bom @@ -118,6 +118,9 @@ public interface IErpBomService public ProcessInstance submitApply(ErpBom erpBom); + @Transactional(rollbackFor = Exception.class) + ProcessInstance submitUpdateApply(ErpBom erpBom); + ErpBom selectErpBomByOneMaterialNo(String materialNo); List selectSubBomsByParentMaterialNo(Map params); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/erp/service/impl/ErpBomServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/erp/service/impl/ErpBomServiceImpl.java index d6bcb09e..af277e94 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/erp/service/impl/ErpBomServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/erp/service/impl/ErpBomServiceImpl.java @@ -345,22 +345,24 @@ private ISysAttachService attachService; /** * 修改bom * - * @param erpBomVo bom + * @param erpBom bom * @return 结果 */ @Override - public int updateErpBom(ErpBomVo erpBomVo) + public int updateErpBom(ErpBom erpBom) { String loginName = ShiroUtils.getLoginName(); - erpBomVo.setUpdateBy(loginName); - erpBomVo.setEngineer(loginName); - erpBomVo.setUpdateTime(DateUtils.getNowDate()); - int editFlag = erpBomMapper.updateErpBom(erpBomVo); - Long id = erpBomVo.getId(); + erpBom.setUpdateBy(loginName); + erpBom.setEngineer(loginName); + erpBom.setUpdateTime(DateUtils.getNowDate()); + int editFlag = erpBomMapper.updateErpBom(erpBom); + + Long id = erpBom.getId(); try { //todo 添加bom信息子组件列表 - List erpBomSubList = erpBomVo.getErpBomList(); + List erpBomSubList = erpBom.getErpBomList(); if (CollectionUtils.isNotEmpty(erpBomSubList)) { + erpBomMapper.deleteErpBomByParentId(id); for (int i = 0; i < erpBomSubList.size(); i++) { ErpBom erpBom1 = erpBomSubList.get(i); erpBom1.setId(null); @@ -368,7 +370,7 @@ private ISysAttachService attachService; erpBom1.setParentId(id); erpBom1.setCreateBy(ShiroUtils.getLoginName()); erpBom1.setCreateTime(DateUtils.getNowDate()); - erpBomMapper.updateErpBom(erpBom1); + erpBomMapper.insertErpBom(erpBom1); } } @@ -703,6 +705,38 @@ private ISysAttachService attachService; return processInstance; } + /** + * 提交更新申请 + * @param erpBom + * @return + */ + @Transactional(rollbackFor = Exception.class) + @Override + public ProcessInstance submitUpdateApply(ErpBom erpBom) { + SysUser user = ShiroUtils.getSysUser(); + erpBom.setApplyUser(user.getLoginName()); + erpBom.setApplyTime(DateUtils.getNowDate()); + //获取插入的Bom列表的id + updateErpBom(erpBom); + // 启动流程 + String applyTitle = user.getUserName()+"发起了物料BOM信息提交审批-"+DateUtils.dateTimeNow(); + String instanceType = "submit"; + ProcessInstance processInstance = startProcessInstance(applyTitle,instanceType,erpBom, user); + String processInstanceId = processInstance.getProcessInstanceId(); + // 提交实例id + erpBom.setSubmitInstanceId(processInstanceId); + // 存在提交完就流程结束的情况 + boolean processIsFinish = processService.judgeProcessIsFinish(processInstanceId); + if(processIsFinish){ + // 审核状态-审核通过 + erpBom.setAuditStatus("1"); + // 使用状态-是 + erpBom.setUseStatus("1"); + } + erpBomMapper.updateErpBom(erpBom); + return processInstance; + } + @Override public ErpBom selectErpBomByOneMaterialNo(String materialNo) { return erpBomMapper.selectErpBomByOneMaterialNo(materialNo); From c656aef162e8d0788de316db49d8f9b6f2022151 Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Thu, 1 Aug 2024 17:34:01 +0800 Subject: [PATCH 08/15] =?UTF-8?q?[feat]=20=E7=94=9F=E4=BA=A7=E7=AE=A1?= =?UTF-8?q?=E7=90=86=20=E7=94=9F=E4=BA=A7=E9=A2=86=E6=96=99=E5=8D=95?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=89=A9=E6=96=99=E5=90=88=E8=AE=A1=E5=92=8C?= =?UTF-8?q?=E6=95=B0=E9=87=8F=E5=90=88=E8=AE=A1=E5=AD=97=E6=AE=B5=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E5=A2=9E=E7=94=9F=E4=BA=A7=E9=A2=86?= =?UTF-8?q?=E6=96=99=E5=8D=95=E6=95=B0=E6=8D=AE=E5=90=8E=E7=AB=AF=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=EF=BC=9A=E6=96=B0=E5=A2=9E=E7=94=9F=E4=BA=A7=E9=A2=86?= =?UTF-8?q?=E6=96=99=E5=8D=95=E8=AF=A6=E6=83=85=E7=9A=84=E6=97=B6=E5=80=99?= =?UTF-8?q?=E8=AE=A1=E7=AE=97=E7=89=A9=E6=96=99=E5=90=88=E8=AE=A1=E5=92=8C?= =?UTF-8?q?=E6=95=B0=E9=87=8F=E5=90=88=E8=AE=A1=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E7=94=9F=E4=BA=A7=E9=A2=86=E6=96=99=E5=8D=95=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=96=B9=E6=B3=95=EF=BC=9A=E6=96=B0=E5=A2=9E=E7=89=A9=E6=96=99?= =?UTF-8?q?=E5=90=88=E8=AE=A1=E5=92=8C=E6=95=B0=E9=87=8F=E5=90=88=E8=AE=A1?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=20=E4=BF=AE=E6=94=B9=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E9=A2=86=E6=96=99=E5=8D=95=E6=96=B0=E5=A2=9E=E6=96=B9=E6=B3=95?= =?UTF-8?q?=EF=BC=9A=E6=96=B0=E5=A2=9E=E7=89=A9=E6=96=99=E5=90=88=E8=AE=A1?= =?UTF-8?q?=E5=92=8C=E6=95=B0=E9=87=8F=E5=90=88=E8=AE=A1=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/system/domain/SysMakeorderPick.java | 26 ++++++++++++++++++- .../system/domain/SysMakeorderPickVo.java | 5 ---- .../impl/SysMakeorderPickServiceImpl.java | 12 ++++++++- .../mapper/system/SysMakeorderPickMapper.xml | 8 ++++-- 4 files changed, 42 insertions(+), 9 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysMakeorderPick.java b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysMakeorderPick.java index f45a51e8..8209a79a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysMakeorderPick.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysMakeorderPick.java @@ -50,6 +50,11 @@ public class SysMakeorderPick extends BaseEntity @Excel(name = "领料员") private String pickUser; + /*物料合计*/ + private Integer materialSum; + /*数量合计*/ + private Integer enterpriseSum; + /** 审核状态 0-待审核 1-审核通过 2-审核拒绝 */ @Excel(name = "审核状态 0-待审核 1-审核通过 2-审核拒绝") private String auditStatus; @@ -161,7 +166,24 @@ public class SysMakeorderPick extends BaseEntity { return pickUser; } - public void setAuditStatus(String auditStatus) + + public Integer getMaterialSum() { + return materialSum; + } + + public void setMaterialSum(Integer materialSum) { + this.materialSum = materialSum; + } + + public Integer getEnterpriseSum() { + return enterpriseSum; + } + + public void setEnterpriseSum(Integer enterpriseSum) { + this.enterpriseSum = enterpriseSum; + } + + public void setAuditStatus(String auditStatus) { this.auditStatus = auditStatus; } @@ -267,6 +289,8 @@ public class SysMakeorderPick extends BaseEntity .append("outOrderCode", getOutOrderCode()) .append("pickStatus", getPickStatus()) .append("pickUser", getPickUser()) + .append("materialSum", getMaterialSum()) + .append("enterpriseSum", getEnterpriseSum()) .append("auditStatus", getAuditStatus()) .append("instanceId", getInstanceId()) .append("instanceType", getInstanceType()) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysMakeorderPickVo.java b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysMakeorderPickVo.java index f722abd9..05ddc621 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysMakeorderPickVo.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysMakeorderPickVo.java @@ -32,11 +32,6 @@ public class SysMakeorderPickVo extends SysMakeorderPick { /** 流程实例类型名称 */ private String instanceTypeName; - /*物料合计*/ - private Integer materialSum; - /*数量合计*/ - private Integer enterpriseSum; - /** * 关键词 */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysMakeorderPickServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysMakeorderPickServiceImpl.java index 048b9fd0..792e1e38 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysMakeorderPickServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysMakeorderPickServiceImpl.java @@ -174,10 +174,20 @@ public class SysMakeorderPickServiceImpl implements ISysMakeorderPickService // 生成编号，年月日规则 String billNo = redisCache.generateBillNo("SCLL"); sysMakeorderPick.setPickNo(billNo); - int id = sysMakeorderPickMapper.insertSysMakeorderPick(sysMakeorderPick); + //保留领料单数不为空的数据 List filterPickDetails = pickDetails.stream().filter(details -> details.getPickNum() != null).collect(Collectors.toList()); + Integer enterpriseSum = (int) filterPickDetails.stream() + .mapToLong(SysMakeorderPickDetail::getPickNum) + .sum(); + + sysMakeorderPick.setEnterpriseSum(enterpriseSum); + sysMakeorderPick.setMaterialSum(filterPickDetails.size()); + + int id = sysMakeorderPickMapper.insertSysMakeorderPick(sysMakeorderPick); + + // 插入子表 for (int i = 0; i < filterPickDetails.size(); i++) { //获取过滤后的领料单详情 diff --git a/ruoyi-admin/src/main/resources/mapper/system/SysMakeorderPickMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/SysMakeorderPickMapper.xml index 89fa3a13..6703c1fa 100644 --- a/ruoyi-admin/src/main/resources/mapper/system/SysMakeorderPickMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/system/SysMakeorderPickMapper.xml @@ -36,8 +36,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select a.id, a.del_flag, a.create_by, a.create_time, a.update_by, a.update_time, a.remark , a.make_no, a.sale_no, a.pick_no, a.out_order_code, a.pick_status, a.pick_user, a.audit_status , a.instance_id, a.instance_type, a.submit_instance_id, a.cancel_instance_id, a.restore_instance_id, a.apply_title, a.apply_user, a.apply_time - ,b.material_sum - ,b.enterprise_sum + ,a.material_sum + ,a.enterprise_sum from sys_makeorder_pick a left join sys_sales_order b on a.sale_no = b.sales_order_code @@ -90,6 +90,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" out_order_code, pick_status, pick_user, + material_sum, + enterprise_sum, audit_status, instance_id, instance_type, @@ -113,6 +115,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{outOrderCode}, #{pickStatus}, #{pickUser}, + #{materialSum}, + #{enterpriseSum}, #{auditStatus}, #{instanceId}, #{instanceType}, From 8936cdb068edfcd4c93e4600691503a964429cae Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Thu, 1 Aug 2024 18:44:47 +0800 Subject: [PATCH 09/15] =?UTF-8?q?[feat]=20=E5=93=81=E8=B4=A8=E7=AE=A1?= =?UTF-8?q?=E7=90=86=20=E4=BF=AE=E6=94=B9=E4=BB=93=E5=BA=93=E6=9A=82?= =?UTF-8?q?=E6=94=B6=E8=BD=AC=E5=93=81=E8=B4=A8=E5=8D=95=E5=90=8E=E7=AB=AF?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=96=B9=E6=B3=95=EF=BC=9A=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=93=81=E8=B4=A8=E5=8D=95=E8=AF=A6=E6=83=85=E5=8A=A0=E4=B8=8A?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E5=88=A4=E6=96=AD=EF=BC=9A=E5=A6=82=E6=9E=9C?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E6=8F=92=E5=85=A5=E6=95=B0=E6=8D=AE=E5=88=99?= =?UTF-8?q?=E6=8A=9B=E5=87=BA=E5=BC=82=E5=B8=B8=EF=BC=9B=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=93=81=E8=B4=A8=E5=8D=95=E6=8A=A5=E5=91=8A=E5=8A=A0=E4=B8=8A?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E5=88=A4=E6=96=AD=EF=BC=9A=E5=A6=82=E6=9E=9C?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E6=8F=92=E5=85=A5=E6=95=B0=E6=8D=AE=E5=88=99?= =?UTF-8?q?=E6=8A=9B=E5=87=BA=E5=BC=82=E5=B8=B8=EF=BC=9B=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=93=81=E8=B4=A8=E5=8D=95=E4=B8=8D=E5=90=88=E6=A0=BC=E5=88=86?= =?UTF-8?q?=E7=B1=BB=E5=8A=A0=E4=B8=8A=E6=9D=A1=E4=BB=B6=E5=88=A4=E6=96=AD?= =?UTF-8?q?=EF=BC=9A=E5=A6=82=E6=9E=9C=E6=B2=A1=E6=9C=89=E6=8F=92=E5=85=A5?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=88=99=E6=8A=9B=E5=87=BA=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/QualityOrderServiceImpl.java | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/quality/service/impl/QualityOrderServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/quality/service/impl/QualityOrderServiceImpl.java index f4f42119..8f24fe9f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/quality/service/impl/QualityOrderServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/quality/service/impl/QualityOrderServiceImpl.java @@ -601,7 +601,10 @@ public class QualityOrderServiceImpl implements IQualityOrderService qualityOrderReportUnqualified.setMaterialName(warehouseStorageOrderDetail.getMaterialName()); qualityOrderReportUnqualified.setCreateTime(new Date()); qualityOrderReportUnqualified.setCreateBy(warehouseStorageOrderDetail.getCreateBy()); - orderReportUnqualifiedMapper.insertQualityOrderReportUnqualified(qualityOrderReportUnqualified); + int insertQualityOrderReportUnqualifiedResult = orderReportUnqualifiedMapper.insertQualityOrderReportUnqualified(qualityOrderReportUnqualified); + if (insertQualityOrderReportUnqualifiedResult <= 0){ + throw new BusinessException("插入品质单不合格分类表失败"); + } } @@ -619,7 +622,10 @@ public class QualityOrderServiceImpl implements IQualityOrderService qualityOrderReport.setQualityHasqualifiedNum(warehouseStorageOrderDetail.getQualityHasQualifiedNum()); qualityOrderReport.setCreateTime(new Date()); qualityOrderReport.setCreateBy(warehouseStorageOrderDetail.getCreateBy()); - orderReportMapper.insertQualityOrderReport(qualityOrderReport); + int insertResult = orderReportMapper.insertQualityOrderReport(qualityOrderReport); + if (insertResult <= 0){ + throw new BusinessException("插入品质单报告失败"); + } } //品质单详情表 @@ -653,7 +659,10 @@ public class QualityOrderServiceImpl implements IQualityOrderService qualityOrderDetail.setQualityHasqualifiedNum(warehouseStorageOrderDetail.getQualityHasQualifiedNum()); qualityOrderDetail.setCreateTime(new Date()); qualityOrderDetail.setCreateBy(warehouseStorageOrderDetail.getCreateBy()); - orderDetailMapper.insertQualityOrderDetail(qualityOrderDetail); + int insertResult= orderDetailMapper.insertQualityOrderDetail(qualityOrderDetail); + if (insertResult <= 0){ + throw new BusinessException("插入品质单详情失败"); + } } From 393ad2d020e6222e2a915a4be04539f03ca225a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=99=93=E8=BF=AA?= <2596750866@qq.com> Date: Thu, 1 Aug 2024 20:24:20 +0800 Subject: [PATCH 10/15] =?UTF-8?q?[fix]=20=E9=94=80=E5=94=AE=E7=AE=A1?= =?UTF-8?q?=E7=90=86=20=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=B7=BB=E5=8A=A0=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=AE=A2=E6=88=B7=E8=81=94=E7=B3=BB=E4=BA=BA?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=B8=BA=E5=BF=85=E9=9C=80=EF=BC=9B=20?= =?UTF-8?q?=E5=8E=BB=E9=99=A4=E8=A1=A8=E6=A0=BC=E5=86=85=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E9=99=A4requiredField=E5=A4=96=E5=AD=97=E6=AE=B5=E5=BC=B9?= =?UTF-8?q?=E7=AA=97=E8=AD=A6=E5=91=8A=E6=96=B9=E6=B3=95=EF=BC=9B=20?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E6=96=B0=E5=A2=9E=E8=8E=B7=E5=8F=96=E5=BD=93=E5=89=8D?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E8=87=AA=E5=8A=A8=E5=A1=AB=E5=85=85=E5=88=B0?= =?UTF-8?q?=E6=8E=A5=E5=8D=95=E6=97=B6=E9=97=B4=E8=BE=93=E5=85=A5=E6=A1=86?= =?UTF-8?q?=E6=96=B9=E6=B3=95=EF=BC=9B=20=E8=A1=A8=E5=8D=95=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E6=96=B0=E5=A2=9E=E5=AE=A2=E6=88=B7=E6=96=99=E5=8F=B7?= =?UTF-8?q?=E8=BE=93=E5=85=A5=E6=A1=86=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../templates/system/salesOrder/add.html | 36 +++++++++++++------ 1 file changed, 26 insertions(+), 10 deletions(-) diff --git a/ruoyi-admin/src/main/resources/templates/system/salesOrder/add.html b/ruoyi-admin/src/main/resources/templates/system/salesOrder/add.html index 5ef5c878..ac5f6a30 100644 --- a/ruoyi-admin/src/main/resources/templates/system/salesOrder/add.html +++ b/ruoyi-admin/src/main/resources/templates/system/salesOrder/add.html @@ -86,6 +86,12 @@
+
+ +
+ +
+
@@ -95,7 +101,7 @@
-
@@ -500,10 +506,10 @@ var requiredField = (currencyVal === '1') ? 'materialNoRmb' : 'materialNoUsd'; // 检查是否尝试编辑除requiredField外的字段，且requiredField未填写 - if (field !== requiredField && (!row[requiredField] || row[requiredField].trim() === '')) { - $.modal.alertWarning((currencyVal === '1' ? "请首先填写物料的不含税单价(RMB)" : "请首先填写物料的不含税单价(美元)")); - // 可以选择取消这次编辑操作，但Bootstrap Table默认不会提供直接的API来取消编辑后的保存，您可能需要手动恢复数据或采取其他策略。 - } + // if (field !== requiredField && (!row[requiredField] || row[requiredField].trim() === '')) { + // $.modal.alertWarning((currencyVal === '1' ? "请首先填写物料的不含税单价(RMB)" : "请首先填写物料的不含税单价(美元)")); + // // 可以选择取消这次编辑操作，但Bootstrap Table默认不会提供直接的API来取消编辑后的保存，您可能需要手动恢复数据或采取其他策略。 + // } }); // 初始化时也需要根据当前的货币类型设置一次 @@ -839,19 +845,29 @@ minView: "month", autoclose: true }); - $("input[name='orderReceivingTime']").datetimepicker({ - format: "yyyy-mm-dd", - minView: "month", - autoclose: true - }); + // $("input[name='orderReceivingTime']").datetimepicker({ + // format: "yyyy-mm-dd", + // minView: "month", + // autoclose: true + // }); $("input[name='modificationTime']").datetimepicker({ format: "yyyy-mm-dd", minView: "month", autoclose: true }); + $(document).ready(function () { + var currentDate = new Date(); + var year = currentDate.getFullYear(); + var month = ('0' + (currentDate.getMonth() + 1)).slice(-2); // 月份是从0开始的，所以需要加1 + var day = ('0' + currentDate.getDate()).slice(-2); + var formattedDate = year + '-' + month + '-' + day; + // console.log(formattedDate); + $("input[name='orderReceivingTime']").val(formattedDate); + }); function submitHandler() { if ($.validate.form()) { var formData = $("#form-salesOrder-add").serializeArray(); + console.log(formData); var tableData = $("#bootstrap-sub-table-order").bootstrapTable('getData'); console.log("tableData",JSON.stringify(tableData)); var rows = tableData.length; From e7dcd8d7c30318018ef5860a694a4a4c25396476 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=99=93=E8=BF=AA?= <2596750866@qq.com> Date: Thu, 1 Aug 2024 20:25:21 +0800 Subject: [PATCH 11/15] =?UTF-8?q?[feat]=20=E9=94=80=E5=94=AE=E7=AE=A1?= =?UTF-8?q?=E7=90=86=20=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=20=E9=94=80?= =?UTF-8?q?=E5=94=AE=E8=AE=A2=E5=8D=95=E5=AE=9E=E4=BD=93=E7=B1=BB=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=AE=A2=E6=88=B7=E6=96=99=E5=8F=B7=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=EF=BC=9B=20=E4=BF=AE=E6=94=B9mapper=E7=9B=B8=E5=85=B3=E8=AF=AD?= =?UTF-8?q?=E5=8F=A5=EF=BC=8C=E6=96=B0=E5=A2=9E=E5=AE=A2=E6=88=B7=E6=96=99?= =?UTF-8?q?=E5=8F=B7=E5=AD=97=E6=AE=B5=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ruoyi/system/domain/SysSalesOrder.java | 9 +++++++++ .../resources/mapper/system/SysSalesOrderMapper.xml | 10 ++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSalesOrder.java b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSalesOrder.java index 65b06c5e..31779d3b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSalesOrder.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSalesOrder.java @@ -151,6 +151,7 @@ public class SysSalesOrder extends BaseEntity { private Integer outBoundQuantity; @Excel(name = "未出库数量") private Integer unBoundQuantity; + private String enterpriseMaterialNo; private String applyUser; private Date applyTime; private String submitInstanceId; @@ -669,6 +670,14 @@ public class SysSalesOrder extends BaseEntity { this.selectAftersalesNoticeVOList = selectAftersalesNoticeVOList; } + public String getEnterpriseMaterialNo() { + return enterpriseMaterialNo; + } + + public void setEnterpriseMaterialNo(String enterpriseMaterialNo) { + this.enterpriseMaterialNo = enterpriseMaterialNo; + } + @Override public String toString() { return Objects.toStringHelper(this) diff --git a/ruoyi-admin/src/main/resources/mapper/system/SysSalesOrderMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/SysSalesOrderMapper.xml index fd5d8a4d..4c2b97d4 100644 --- a/ruoyi-admin/src/main/resources/mapper/system/SysSalesOrderMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/system/SysSalesOrderMapper.xml @@ -16,6 +16,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -77,7 +78,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select sales_order_id, use_status, audit_status, make_status, delivery_status,close_status, sales_order_code, sales_order_number, sales_order_type,enterprise_code,customer_purser, - common_currency,enterprise_name, material_sum, enterprise_sum, noRmbPrice, noRmbSum, rmbPrice, + common_currency,enterprise_name,enterprise_material_no, material_sum, enterprise_sum, noRmbPrice, noRmbSum, rmbPrice, rmbTaxSum,noUsdPrice, noUsdSum, usdPrice, usdTaxSum, payment_terms, delivery_time, delivery_conditions, delivery_method, delivery_address,delivery_phone,customer_delivery, order_receiving_mode,order_receiving_time,customer_contact, contact_number,contact_email, contact_post, @@ -92,7 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"