[fix]

生产管理 生产订单
修改生产订单物料合计、数量合计等字段类型为Integer；
修改生产bom跳转编辑页面对象为makeOrderBom；
修改生产订单列表controller方法，去除查找销售订单关联赋值语句；
修改编辑生产bom页面表单对象为生产bom；

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());
                 }
             }
         }

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<SysMakeorderBom> 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";

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)
+
-    {
+    public void setMaterial(Integer material) {
-        this.materialSum = materialSum;
+        this.material = material;
     }
 
-    public int getMaterialSum()
+    public Integer getMaterialSum() {
-    {
         return materialSum;
     }
-    public void setFinishNum(int finishNum)
+
-    {
+    public void setMaterialSum(Integer materialSum) {
-        this.finishNum = finishNum;
+        this.materialSum = materialSum;
     }
 
-    public int getFinishNum()
+    public Integer getFinishNum() {
-    {
         return finishNum;
     }
-    public void setEceiptNum(int eceiptNum)
+
-    {
+    public void setFinishNum(Integer finishNum) {
-        this.eceiptNum = eceiptNum;
+        this.finishNum = finishNum;
     }
 
-    public int getEceiptNum()
+    public Integer getEceiptNum() {
-    {
         return eceiptNum;
     }
 
+    public void setEceiptNum(Integer eceiptNum) {
+        this.eceiptNum = eceiptNum;
+    }
+
     public BigDecimal getNoRate() {
         return noRate;
     }

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);
         // 生成部门待预审数据

ruoyi-admin/src/main/resources/templates/system/makeorder/editMakeOrderBom.html

@@ -7,7 +7,7 @@
 </head>
 <body class="white-bg">
 <div class="wrapper wrapper-content animated fadeInRight ibox-content">
-    <form class="form-horizontal m" id="form-bom-edit" th:object="${erpBom}">
+    <form class="form-horizontal m" id="form-bom-edit" th:object="${makeorderBom}">
         <input id="id" name="id" th:field="*{id}" type="text" hidden>
         <input id="curIndex" name="curIndex" th:value="${curIndex}" type="text" hidden>
         <input id="makeNo" name="makeNo" th:value="${makeNo}" type="text" hidden>
@@ -92,8 +92,8 @@
 <script th:src="@{/js/activiti.js}"></script>
 <script th:inline="javascript">
     var prefix = ctx + "system/makeorderbom";
-    var erpBom = [[${erpBom}]];
+    var erpBom = [[${makeorderBom}]];
-    var materialType1 = [[${erpBom.materialType}]];
+    var materialType1 = [[${makeorderBom.materialType}]];
     var materialNo = erpBom.materialNo;
     var processMethodDatas = [[${@dict.getType('processMethod')}]];
     var sysUnitClassDatas = [[${@dict.getType('sys_unit_class')}]];