Merge remote-tracking branch 'origin/master'

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java

@@ -47,7 +47,6 @@ import com.yxt.anrui.as.biz.asserviceitem.AsServiceItemService;
 import com.yxt.anrui.as.biz.astechtitledetail.AsTechTitleDetailService;
 import com.yxt.anrui.as.biz.astrackbill.AsTrackBillService;
 import com.yxt.anrui.as.biz.astrackquestion.AsTrackQuestionService;
-import com.yxt.anrui.as.feign.crm.CrmCustomerTemp;
 import com.yxt.anrui.as.feign.crm.CrmCustomerTempFeign;
 import com.yxt.anrui.as.feign.file.AsFileEnum;
 import com.yxt.anrui.as.feign.fin.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedFeign;
@@ -613,7 +612,7 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
             if (null != asBusrepairBill.getNodeTime()) {
                 vo.setNodeTime(sdf.format(asBusrepairBill.getNodeTime()));
             }
-            CrmCustomerTemp customerTemp = crmCustomerTempFeign.fetchEntity(asBusrepairBill.getCustomerSid()).getData();
+            CrmCustomer customerTemp = yxtCrmCustomerTempFeign.fetchEntity(asBusrepairBill.getCustomerSid()).getData();
             if (null != customerTemp) {
                 if (StringUtils.isNotBlank(customerTemp.getSource())) {
                     vo.setCustomerSource(customerTemp.getSource());

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillService.java

@@ -305,6 +305,9 @@ public class AsBusrepairInventorybillService extends MybatisBaseService<AsBusrep
                     AsBusrepairInventorybillDetail detailUpdate = asBusrepairInventorybillDetailService.fetchBySid(sid);
                     BigDecimal count = BigDecimal.ZERO;
                     BigDecimal currentCount = BigDecimal.ZERO;
+                    BigDecimal discount = BigDecimal.ZERO;//折扣
+                    BigDecimal cost = BigDecimal.ZERO;//成本单价
+                    BigDecimal price = BigDecimal.ZERO;// 单价
                     if (null != detailUpdate) {
                         if (null != detailUpdate.getCurrentCount()) {
                             currentCount = detailUpdate.getCurrentCount();
@@ -312,8 +315,22 @@ public class AsBusrepairInventorybillService extends MybatisBaseService<AsBusrep
                         if (StringUtils.isNotBlank(sDto.getCount())) {
                             count = new BigDecimal(sDto.getCount());
                         }
+                        if (null != detailUpdate.getDiscount()) {
+                            discount = new BigDecimal(detailUpdate.getDiscount()).multiply(new BigDecimal("0.1"));
+                        }
+                        if (null != detailUpdate.getPrice()) {
+                            price = detailUpdate.getPrice();
+                        }
+                        if (null != detailUpdate.getCost()) {
+                            cost = detailUpdate.getCost();
+                        }
                         BigDecimal subtract = currentCount.subtract(count);
                         detailUpdate.setCurrentCount(subtract);
+                        BigDecimal priceSubtract = subtract.multiply(price).multiply(discount);
+                        BigDecimal amountAll = price.multiply(subtract);
+                        detailUpdate.setDiscountAmount(amountAll.subtract(priceSubtract));
+                        detailUpdate.setAmount(priceSubtract);
+                        detailUpdate.setCostTotal(subtract.multiply(cost));
                         asBusrepairInventorybillDetailService.updateById(detailUpdate);
                         detail.setCurrentCount(subtract);
                         if (StringUtils.isNotBlank(sDto.getReturnAmount())) {

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailMapper.xml

@@ -27,7 +27,7 @@
         FROM as_busrepair_inventorybill_detail AS d
                  LEFT JOIN as_busrepair_inventorybill AS b ON b.sid = d.billSid
         WHERE b.sourceBillSid = #{sid}
-          and d.isEnable = 1
+          and d.isEnable = 1 and d.currentCount > 0
 --         GROUP BY d.goodsID
     </select>
     <select id="getGoodsDetailsByBillSidForBack"
@@ -39,7 +39,7 @@
                 LEFT JOIN as_busrepair_inventorybill AS b ON b.sid = d.billSid
         WHERE
             b.sourceBillSid = #{sid}
-            and d.isEnable = 1
+            and d.isEnable = 1 and d.currentCount > 0
 --         GROUP BY
 --             d.goodsID,d.sitemSid
     </select>

yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleService.java

@@ -187,7 +187,11 @@ public class AsCustomerVehicleService extends MybatisBaseService<AsCustomerVehic
         } else {
             AsCustomerVehicle asCustomerVehicle = new AsCustomerVehicle();
             BeanUtil.copyProperties(dto, asCustomerVehicle, "id", "sid");
-            asCustomerVehicle.setVehState(1);
+            if (dto.getVehState().equals("0")) {
+                asCustomerVehicle.setVehState(0);
+            } else {
+                asCustomerVehicle.setVehState(1);
+            }
             asCustomerVehicle.setRemarks(dto.getCarRemarks());
             baseMapper.insert(asCustomerVehicle);
             AsCustomervehMaintenance maintenance = new AsCustomervehMaintenance();