Browse Source

修复维修报价,备件确实

lyhzzz 2 years ago
parent
commit
42988aafad

+ 1 - 1
src/main/java/com/fdkankan/sale/entity/PriceList.java

@@ -57,7 +57,7 @@ public class PriceList implements Serializable {
     private Integer count;
 
     @TableField("rec_status")
-    @TableLogic(value = "A",delval = "I")
+    //@TableLogic(value = "A",delval = "I")
     private String recStatus;
 
     @TableField("create_time")

+ 9 - 2
src/main/java/com/fdkankan/sale/service/impl/RepairSaleService.java

@@ -178,6 +178,9 @@ public class RepairSaleService {
         HashMap<Integer,Part> partMap = partService.getHashMap();
         HashMap<Integer,LaborCost> laborMap = laborCostService.getHashMap();
 
+        List<PriceList> priceListList = priceListService.getByRepairId(repair.getRepairId());
+        HashMap<Integer,PriceList> priceListHashMap = new HashMap<>();
+        priceListList.forEach(entity -> priceListHashMap.put(entity.getPriceListId(),entity));
 
         priceListService.delNoCm(repair.getRepairId());
         for (PriceList priceList : param.getPriceLists()) {
@@ -205,8 +208,12 @@ public class RepairSaleService {
             }
             priceList.setRepairId(param.getRepairId());
             if(priceList.getPriceListId() != null){
-                priceList.setRecStatus("A");
-                priceListService.updateById(priceList);
+                PriceList priceList1 = priceListHashMap.get(priceList.getPriceListId());
+                if(priceList1 != null){
+                    BeanUtils.copyProperties(priceList,priceList1);
+                    priceList1.setPriceListId(null);
+                    priceListService.save(priceList1);
+                }
             }else {
                 priceListService.save(priceList);
             }