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 c0ffb290..945d0ea8 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 @@ -154,7 +154,6 @@ public class PurchaseOrderController extends BaseController for (int i = 0; i < planCodes.length - 1; i++) { String planCode = planCodes[i]; String correlationCode = correlationCodes[i]; - String purchaseQuote = purchaseQuoteCodes[i]; if (planCode != null) { PurchaseOrderChild material = new PurchaseOrderChild(); child.setPurchaseOrderCode(purchaseOrder.getPurchaseOrderCode()); @@ -186,6 +185,7 @@ public class PurchaseOrderController extends BaseController material.setPurchaseQuoteCode(purchaseOrder.getPurchaseOrderCode()); material.setSupplierCode(child.getSupplierCode()); material.setMaterialUnit(child.getMaterialUnit()); + material.setWarehouseDept(child.getWarehouseDept()); material.setSupplierName(child.getSupplierName()); material.setMaterialCode(child.getMaterialCode()); material.setMaterialName(child.getMaterialName()); @@ -206,7 +206,7 @@ public class PurchaseOrderController extends BaseController material.setMaterialNoRmbSum(child.getMaterialNoRmbSum()); material.setCorrelationCode(correlationCode); material.setPurchasePlanCode(planCode); - material.setPurchaseQuoteCode(purchaseQuote); + material.setPurchaseQuoteCode(child.getPurchaseQuoteCode()); material.setEceiptStatus("0"); material.setPaymentStatus("0"); material.setDelFlag("0"); @@ -220,7 +220,8 @@ public class PurchaseOrderController extends BaseController } child.setMaterialNoRmb(BigDecimal.ZERO); } - else if ((child.getCorrelationCode().contains(",")==false) && child.getPurchasePlanCode() != null) { + else if ((child.getCorrelationCode().contains(",")==false) + && child.getPurchasePlanCode() != null) { PurchaseOrderChild material = new PurchaseOrderChild(); child.setPurchaseOrderCode(purchaseOrder.getPurchaseOrderCode()); //获取物料供应商采购价格 @@ -250,6 +251,7 @@ public class PurchaseOrderController extends BaseController material.setPurchaseOrderCode(purchaseOrder.getPurchaseOrderCode()); material.setSupplierCode(child.getSupplierCode()); material.setMaterialUnit(child.getMaterialUnit()); + material.setWarehouseDept(child.getWarehouseDept()); material.setSupplierName(child.getSupplierName()); material.setMaterialCode(child.getMaterialCode()); material.setMaterialName(child.getMaterialName()); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/purchase/controller/PurchasePlanController.java b/ruoyi-admin/src/main/java/com/ruoyi/purchase/controller/PurchasePlanController.java index eab8ca9b..7c4589b5 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/purchase/controller/PurchasePlanController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/purchase/controller/PurchasePlanController.java @@ -134,7 +134,7 @@ public class PurchasePlanController extends BaseController //用stream流处理相同供应商\物料\ //将供应商信息解析成List mmap.put("purchasePlanList", purchasePlanList); - mmap.put("purchasePlanCodes", uniquePurchasePlanCodes); + mmap.put("purchasePlanCodes", purchasePlanCodeArray); mmap.put("purchasePlanChildList", purchasePlanChildList); return prefix + "/addPurchaseOrder"; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/purchase/domain/PurchaseOrderChild.java b/ruoyi-admin/src/main/java/com/ruoyi/purchase/domain/PurchaseOrderChild.java index 42f52729..29852448 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/purchase/domain/PurchaseOrderChild.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/purchase/domain/PurchaseOrderChild.java @@ -144,12 +144,22 @@ public class PurchaseOrderChild extends BaseEntity @Excel(name = "通知到货数量") private Integer notifyArriveNum; + private Integer notifyHasArriveNum; + /** 实际已到货数量 */ @Excel(name = "实际已到货数量") private Integer actualHasArrivedNum; private Integer notifyArrivedNum; + public Integer getNotifyHasArriveNum() { + return notifyHasArriveNum; + } + + public void setNotifyHasArriveNum(Integer notifyHasArriveNum) { + this.notifyHasArriveNum = notifyHasArriveNum; + } + public Integer getNotifyArrivedNum() { return notifyArrivedNum; } diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index cb3dd94b..b0cc9dd7 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -38,7 +38,6 @@ logging: level: com.ruoyi: debug org.springframework: warn - org.activiti.db.sql: debug diff --git a/ruoyi-admin/src/main/resources/mapper/purchase/PurchaseOrderChildMapper.xml b/ruoyi-admin/src/main/resources/mapper/purchase/PurchaseOrderChildMapper.xml index 0e2c0946..423b7e9d 100644 --- a/ruoyi-admin/src/main/resources/mapper/purchase/PurchaseOrderChildMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/purchase/PurchaseOrderChildMapper.xml @@ -173,7 +173,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" material_photo_url = #{materialPhotourl} material_process_method = #{materialProcessMethod}, material_unit = #{materialUnit}, - warehouse_dept = #{warehouseDept}, + warehousezDept = #{warehouseDept}, material_no_rmb = #{materialNoRmb}, material_rmb = #{materialRmb}, material_num = #{materialNum}, diff --git a/ruoyi-admin/src/main/resources/mapper/purchase/PurchasePlanChildMapper.xml b/ruoyi-admin/src/main/resources/mapper/purchase/PurchasePlanChildMapper.xml index 4a53433e..da194649 100644 --- a/ruoyi-admin/src/main/resources/mapper/purchase/PurchasePlanChildMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/purchase/PurchasePlanChildMapper.xml @@ -230,8 +230,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join purchase_plan as plan on plan.purchase_plan_code = planChild.purchase_plan_code where plan.purchase_plan_code IN - #{purchasePlanCode} - + #{purchasePlanCode} + group by material_code \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/purchase/purchaseOrder/addPurchaseStorage.html b/ruoyi-admin/src/main/resources/templates/purchase/purchaseOrder/addPurchaseStorage.html index e8b9d436..9235ef9e 100644 --- a/ruoyi-admin/src/main/resources/templates/purchase/purchaseOrder/addPurchaseStorage.html +++ b/ruoyi-admin/src/main/resources/templates/purchase/purchaseOrder/addPurchaseStorage.html @@ -114,7 +114,7 @@ {title: '计划采购数',field: 'materialNum',}, {title: '实际采购数',field: 'materialRealNum',}, {title: '交付时间',field: 'deliveryTime',}, - {title: '通知已到货数',field: 'notifyHasArrivedNum', + {title: '通知已到货数',field: 'notifyArriveNum', formatter: function (value, row, index) { if (value == null || value == '') { return 0; diff --git a/ruoyi-admin/src/main/resources/templates/purchase/purchasePlan/addPurchaseOrder.html b/ruoyi-admin/src/main/resources/templates/purchase/purchasePlan/addPurchaseOrder.html index f010beaf..34d2d5c9 100644 --- a/ruoyi-admin/src/main/resources/templates/purchase/purchasePlan/addPurchaseOrder.html +++ b/ruoyi-admin/src/main/resources/templates/purchase/purchasePlan/addPurchaseOrder.html @@ -2,6 +2,8 @@ + +
@@ -9,7 +11,7 @@
- +
@@ -78,6 +80,8 @@
+ + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storagePurchase.html b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storagePurchase.html index a9b8ac0c..7d34a6f9 100644 --- a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storagePurchase.html +++ b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storagePurchase.html @@ -3,6 +3,7 @@ +