From 4137d5d9ab2005aee1afe81f601544aa8ac820c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=99=93=E8=BF=AA?= <2596750866@qq.com> Date: Fri, 29 Nov 2024 16:18:51 +0800 Subject: [PATCH] =?UTF-8?q?[fix]=20=E7=94=9F=E4=BA=A7=E7=AE=A1=E7=90=86=20?= =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=AE=A2=E5=8D=95=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=AE=A2=E5=8D=95=E7=89=A9=E6=96=99=E5=90=88?= =?UTF-8?q?=E8=AE=A1=E3=80=81=E6=95=B0=E9=87=8F=E5=90=88=E8=AE=A1=E7=AD=89?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E7=B1=BB=E5=9E=8B=E4=B8=BAInteger=EF=BC=9B?= =?UTF-8?q?=20=E4=BF=AE=E6=94=B9=E7=94=9F=E4=BA=A7bom=E8=B7=B3=E8=BD=AC?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E9=A1=B5=E9=9D=A2=E5=AF=B9=E8=B1=A1=E4=B8=BA?= =?UTF-8?q?makeOrderBom=EF=BC=9B=20=E4=BF=AE=E6=94=B9=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8controller=E6=96=B9?= =?UTF-8?q?=E6=B3=95=EF=BC=8C=E5=8E=BB=E9=99=A4=E6=9F=A5=E6=89=BE=E9=94=80?= =?UTF-8?q?=E5=94=AE=E8=AE=A2=E5=8D=95=E5=85=B3=E8=81=94=E8=B5=8B=E5=80=BC?= =?UTF-8?q?=E8=AF=AD=E5=8F=A5=EF=BC=9B=20=E4=BF=AE=E6=94=B9=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E7=94=9F=E4=BA=A7bom=E9=A1=B5=E9=9D=A2=E8=A1=A8?= =?UTF-8?q?=E5=8D=95=E5=AF=B9=E8=B1=A1=E4=B8=BA=E7=94=9F=E4=BA=A7bom?= =?UTF-8?q?=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SysMakeOrderController.java | 4 +- .../controller/SysMakeorderBomController.java | 8 +++- .../com/ruoyi/system/domain/SysMakeOrder.java | 46 +++++++++---------- .../service/impl/SysMakeOrderServiceImpl.java | 2 +- .../system/makeorder/editMakeOrderBom.html | 6 +-- 5 files changed, 34 insertions(+), 32 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysMakeOrderController.java b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysMakeOrderController.java index 719b9d37..7ec1ed5d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysMakeOrderController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysMakeOrderController.java @@ -489,9 +489,9 @@ public class SysMakeOrderController extends BaseController makeOrder.setCustomerName(sysSalesOrder.getEnterpriseName()); makeOrder.setCustomerId(sysSalesOrder.getEnterpriseCode()); makeOrder.setCustomerOderCode(sysSalesOrder.getSalesOrderNumber()); - makeOrder.setMaterial(String.valueOf(sysSalesOrder.getMaterialSum())); +// makeOrder.setMaterial(String.valueOf(sysSalesOrder.getMaterialSum())); //这个类型需要注意 - makeOrder.setMaterialSum(sysSalesOrder.getEnterpriseSum()); +// makeOrder.setMaterialSum(sysSalesOrder.getEnterpriseSum()); } } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysMakeorderBomController.java b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysMakeorderBomController.java index 24463965..fce8a090 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysMakeorderBomController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysMakeorderBomController.java @@ -172,7 +172,13 @@ public class SysMakeorderBomController extends BaseController ,@RequestParam("materialNo")String materialNo, @RequestParam("makeNo")String makeNo, ModelMap mmap) { ErpBom erpBom = erpBomService.selectErpBomByOneMaterialNo(materialNo); - mmap.put("erpBom", erpBom); + SysMakeorderBom tempBom = new SysMakeorderBom(); + tempBom.setMakeNo(makeNo); + tempBom.setMaterialNo(materialNo); + tempBom.setLevel(0L); + List list = sysMakeorderBomService.selectSysMakeorderBomList(tempBom); + SysMakeorderBom makeorderBom = list.get(0); + mmap.put("makeorderBom", makeorderBom); mmap.put("curIndex", curIndex); mmap.put("makeNo", makeNo); return "/system/makeorder/editMakeOrderBom"; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysMakeOrder.java b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysMakeOrder.java index 4f57e875..fd1f0db3 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysMakeOrder.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysMakeOrder.java @@ -70,19 +70,19 @@ public class SysMakeOrder extends BaseEntity /** 物料合计 */ @Excel(name = "物料合计") - private String material; + private Integer material; /** 数量合计 */ @Excel(name = "数量合计") - private int materialSum; + private Integer materialSum; /** 已完成数量 */ @Excel(name = "已完成数量") - private int finishNum; + private Integer finishNum; /** 已入库数量 */ @Excel(name = "已入库数量") - private int eceiptNum; + private Integer eceiptNum; /** 不含税生产成本(RMB) */ @Excel(name = "不含税生产成本(RMB)") @@ -210,43 +210,39 @@ public class SysMakeOrder extends BaseEntity { return customerOderCode; } - public void setMaterial(String material) - { - this.material = material; - } - public String getMaterial() - { + public Integer getMaterial() { return material; } - public void setMaterialSum(int materialSum) - { - this.materialSum = materialSum; + + public void setMaterial(Integer material) { + this.material = material; } - public int getMaterialSum() - { + public Integer getMaterialSum() { return materialSum; } - public void setFinishNum(int finishNum) - { - this.finishNum = finishNum; + + public void setMaterialSum(Integer materialSum) { + this.materialSum = materialSum; } - public int getFinishNum() - { + public Integer getFinishNum() { return finishNum; } - public void setEceiptNum(int eceiptNum) - { - this.eceiptNum = eceiptNum; + + public void setFinishNum(Integer finishNum) { + this.finishNum = finishNum; } - public int getEceiptNum() - { + public Integer getEceiptNum() { return eceiptNum; } + public void setEceiptNum(Integer eceiptNum) { + this.eceiptNum = eceiptNum; + } + public BigDecimal getNoRate() { return noRate; } 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 3940ee11..c07f1629 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 @@ -275,7 +275,7 @@ public class SysMakeOrderServiceImpl implements ISysMakeOrderService makeOrder.setCustomerOderCode(sysSalesOrderVo.getSalesOrderNumber()); //这里需要注意一下类型 makeOrder.setMaterialSum(sysSalesOrderVo.getEnterpriseSum()); - makeOrder.setMaterial(String.valueOf(sysSalesOrderVo.getMaterialSum())); + makeOrder.setMaterial(sysSalesOrderVo.getMaterialSum()); String makeNo = redisCache.generateBillNo("PO"); makeOrder.setMakeNo(makeNo); // 生成部门待预审数据 diff --git a/ruoyi-admin/src/main/resources/templates/system/makeorder/editMakeOrderBom.html b/ruoyi-admin/src/main/resources/templates/system/makeorder/editMakeOrderBom.html index 4bfb76c5..86642b4b 100644 --- a/ruoyi-admin/src/main/resources/templates/system/makeorder/editMakeOrderBom.html +++ b/ruoyi-admin/src/main/resources/templates/system/makeorder/editMakeOrderBom.html @@ -7,7 +7,7 @@
-
+ @@ -92,8 +92,8 @@