优化采购管理细节问题

java110-bean/src/main/java/com/java110/dto/purchaseApply/PurchaseApplyDetailDto.java

@@ -21,6 +21,7 @@ public class PurchaseApplyDetailDto {
     private String specName;
     private String standardPrice;
     private String originalStock;
+    private String supplierName;
 
     public String getApplyOrderId() {
         return applyOrderId;
@@ -157,6 +158,14 @@ public class PurchaseApplyDetailDto {
     public void setOriginalStock(String originalStock) {
         this.originalStock = originalStock;
     }
+
+    public String getSupplierName() {
+        return supplierName;
+    }
+
+    public void setSupplierName(String supplierName) {
+        this.supplierName = supplierName;
+    }
 }
 
 

java110-bean/src/main/java/com/java110/dto/purchaseApply/PurchaseApplyDto.java

@@ -55,6 +55,7 @@ public class PurchaseApplyDto extends PageDto implements Serializable {
     private String createUserId;
     private String createUserName;
     private String price;
+    private String supplierName;
 
     public String getResOrderType() {
         return resOrderType;
@@ -281,4 +282,12 @@ public class PurchaseApplyDto extends PageDto implements Serializable {
     public void setPrice(String price) {
         this.price = price;
     }
+
+    public String getSupplierName() {
+        return supplierName;
+    }
+
+    public void setSupplierName(String supplierName) {
+        this.supplierName = supplierName;
+    }
 }

java110-bean/src/main/java/com/java110/vo/api/purchaseApply/PurchaseApplyDetailVo.java

@@ -26,6 +26,7 @@ public class PurchaseApplyDetailVo {
     private String specName;
     private String standardPrice;
     private String originalStock;
+    private String supplierName;
 
 
     public String getApplyOrderId() {
@@ -203,6 +204,14 @@ public class PurchaseApplyDetailVo {
     public void setOriginalStock(String originalStock) {
         this.originalStock = originalStock;
     }
+
+    public String getSupplierName() {
+        return supplierName;
+    }
+
+    public void setSupplierName(String supplierName) {
+        this.supplierName = supplierName;
+    }
 }
 
 

java110-db/src/main/resources/mapper/store/PurchaseApplyDetailServiceDaoImplMapper.xml

@@ -189,6 +189,9 @@
             <if test="newBId != null and newBId != ''">
                 t.b_id = #{newBId},
             </if>
+            <if test="rsId != null and rsId != ''">
+                t.rs_id = #{rsId},
+            </if>
             <if test="resId !=null and resId != ''">
                 t.res_id= #{resId},
             </if>

java110-db/src/main/resources/mapper/store/PurchaseApplyServiceDaoImplMapper.xml

@@ -308,7 +308,7 @@
         p.apply_order_id applyOrderId,
         p.res_id resId,p.quantity,p.remark,p.purchase_quantity purchaseQuantity,p.purchase_remark purchaseRemark,p.price purchasePrice,p.original_stock originalStock,
         r.res_name resName,r.res_code resCode,
-        r.price,r.price standardPrice,r.stock,rst.name rstName,rss.spec_name specName
+        r.price,r.price standardPrice,r.stock,rst.name rstName,rss.spec_name specName,rs.supplier_name supplierName
         from
         purchase_apply_detail p inner join resource_store r on p.res_id = r.res_id and r.status_cd = '0'
         LEFT JOIN resource_supplier rs on p.rs_id=rs.rs_id

service-api/src/main/java/com/java110/api/listener/ownerRepair/RepairFinishListener.java

@@ -126,7 +126,7 @@ public class RepairFinishListener extends AbstractServiceApiPlusListener {
         String repairMaterial = "";
         //费用明细(单价 * 数量 = 总价)
         String repairFee = "";
-        if (json.size() > 0) {
+        if (json.size() > 0 && (maintenanceType.equals("1001") || maintenanceType.equals("1003") )) {
             Object[] objects = json.toArray();
             //数据前期校验
             for (int i = 0; i < objects.length; i++) {