From bd4265e0e78ba83d87914e20aea4a034de5c1141 Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Mon, 17 Jun 2024 17:10:33 +0800 Subject: [PATCH] =?UTF-8?q?[fix]=E9=94=80=E5=94=AE=E7=AE=A1=E7=90=86:=20?= =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E7=9A=84=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=EF=BC=8C=E6=A0=B9=E6=8D=AE=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E6=97=B6=E9=97=B4=20=E8=BF=9B=E8=A1=8C=E6=8E=92=E5=BA=8F=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E7=9A=84?= =?UTF-8?q?=E7=89=A9=E6=96=99=E5=90=88=E8=AE=A1=E6=95=B0=E6=8D=AE=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=20Double=20->=20Long=20=E6=96=B0=E5=A2=9E=E9=94=80?= =?UTF-8?q?=E5=94=AE=E8=AE=A2=E5=8D=95=E8=BD=AC=E7=94=9F=E4=BA=A7=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E6=96=B9=E6=B3=95=20=E4=BF=AE=E5=A4=8D=E7=94=9F?= =?UTF-8?q?=E4=BA=A7=E8=AE=A2=E5=8D=95=E7=A1=AE=E8=AE=A4=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E9=97=AE=E9=A2=98=20=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E4=BD=9C=E5=BA=9F=20?= =?UTF-8?q?=E5=89=8D=E7=AB=AFurl?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/controller/SysSalesOrderController.java | 2 ++ .../java/com/ruoyi/system/domain/SysSalesOrder.java | 6 +++--- .../service/impl/SysMakeOrderServiceImpl.java | 9 +++++++++ .../resources/mapper/system/SysSalesOrderMapper.xml | 2 +- .../templates/system/makeorder/bmzgqr.html | 13 +++++++------ .../templates/system/salesOrder/salesOrder.html | 6 ++++++ 6 files changed, 28 insertions(+), 10 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysSalesOrderController.java b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysSalesOrderController.java index f2742678..57a1bdc5 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysSalesOrderController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysSalesOrderController.java @@ -453,6 +453,8 @@ public class SysSalesOrderController extends BaseController SysSalesOrderVo sysSalesOrderVo1 = sysSalesOrderService.selectSysSalesOrderById(sysSalesOrderVo.getSalesOrderId()); //生产订单生成 sysMakeOrderService.generateMakeOrderBySalesOrderCode(sysSalesOrderVo1.getSalesOrderCode()); + + // 提交 if("submit".equals(instanceType)){ // 使用状态-是 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 39759ba4..098637d0 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 @@ -57,7 +57,7 @@ public class SysSalesOrder extends BaseEntity { /*客户电话*/ private String customerPhone; /*物料合计*/ - private Double materialSum; + private Long materialSum; /*数量合计*/ private Long enterpriseSum; /*不含税单价(RMB)*/ @@ -297,11 +297,11 @@ public class SysSalesOrder extends BaseEntity { this.customerPhone = customerPhone; } - public Double getMaterialSum() { + public Long getMaterialSum() { return materialSum; } - public void setMaterialSum(Double materialSum) { + public void setMaterialSum(Long materialSum) { this.materialSum = materialSum; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysMakeOrderServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysMakeOrderServiceImpl.java index ed3c3f43..1d4c5b5e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysMakeOrderServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysMakeOrderServiceImpl.java @@ -195,6 +195,15 @@ public class SysMakeOrderServiceImpl implements ISysMakeOrderService // 是 makeOrder.setUseStatus("1"); makeOrder.setSaleNo(salesOrderCode); + makeOrder.setMakeStatus("0"); + makeOrder.setSalesman(sysSalesOrderVo.getBusinessMembers()); + makeOrder.setSaleNo(sysSalesOrderVo.getSalesOrderCode()); + makeOrder.setOrderType(sysSalesOrderVo.getSalesOrderType()); + makeOrder.setCustomerId(sysSalesOrderVo.getEnterpriseCode()); + makeOrder.setCustomerName(sysSalesOrderVo.getEnterpriseName()); + makeOrder.setCustomerOderCode(sysSalesOrderVo.getSalesOrderNumber()); + makeOrder.setMaterialSum(sysSalesOrderVo.getEnterpriseSum()); + makeOrder.setMaterial(String.valueOf(sysSalesOrderVo.getMaterialSum())); String makeNo = redisCache.generateBillNo("PO"); makeOrder.setMakeNo(makeNo); insertSysMakeOrder(makeOrder); diff --git a/ruoyi-admin/src/main/resources/mapper/system/SysSalesOrderMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/SysSalesOrderMapper.xml index a96caab6..67b49c24 100644 --- a/ruoyi-admin/src/main/resources/mapper/system/SysSalesOrderMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/system/SysSalesOrderMapper.xml @@ -126,7 +126,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and s.apply_time = #{applyTime} and s.apply_title = #{applyTitle} - order by s.apply_time desc + order by s.create_time desc - -
-
-
-
+
+
+
+
+
-
+ +
diff --git a/ruoyi-admin/src/main/resources/templates/system/salesOrder/salesOrder.html b/ruoyi-admin/src/main/resources/templates/system/salesOrder/salesOrder.html index f3576170..4c603bcf 100644 --- a/ruoyi-admin/src/main/resources/templates/system/salesOrder/salesOrder.html +++ b/ruoyi-admin/src/main/resources/templates/system/salesOrder/salesOrder.html @@ -228,6 +228,7 @@ updateUrl: prefix + "/edit/{id}", removeUrl: prefix + "/remove", exportUrl: prefix + "/export", + cancelUrl: prefix + "/cancel/{id}", detailUrl: prefix + "/detail/{id}", pagination: true, pageList: [5, 10, 25, 50], @@ -353,6 +354,11 @@ // 进度查看 actions.push(' 进度查看 '); } + + if (row.makeStatus == "0" || row.makeStatus == "1"){ + actions.push(' 出货 '); + } + // 详情 actions.push(' 详情 '); return actions.join('');