luobang 1 yıl önce
ebeveyn
işleme
ad1b5b7dd3

+ 3 - 2
src/main/java/com/steerinfo/dil/controller/BmstruckDetailsOrderController.java

@@ -493,16 +493,17 @@ public class BmstruckDetailsOrderController extends BaseRESTfulController {
     @PostMapping("updateDetailsStatus")
     public RESTfulResult updateDetailsStatus(@RequestBody Map<String,Object> map) {
         List<Integer> mapList = (List<Integer>)map.get("orderList");
+        List<Integer> detailsOrderList = (List<Integer>) map.get("detailsOrderList");
         List<Map<String,Object>> amsPriceList = (List<Map<String, Object>>) map.get("amsPriceList");
         if (map.get("updateStatus") != null && DataChange.dataToBigDecimal(map.get("updateStatus")).compareTo(new BigDecimal(1)) == 0){
             //取消确认
-            int i = bmstruckDetailsOrderService.cancelMakeSure(mapList);
+            int i = bmstruckDetailsOrderService.cancelMakeSure(detailsOrderList);
             return success(i);
         }
         if (amsPriceList.size()>0){
             bmstruckDetailsOrderService.insertPriceValue(amsPriceList);
         }
-        int i = bmstruckDetailsOrderService.updateDetailsStatus(mapList);
+        int i = bmstruckDetailsOrderService.updateDetailsStatus(detailsOrderList);
         return success(i);
     }
 

+ 1 - 1
src/main/java/com/steerinfo/dil/mapper/BmstruckDetailsOrderMapper.java

@@ -220,7 +220,7 @@ public interface BmstruckDetailsOrderMapper extends IBaseMapper<BmstruckDetailsO
 
     int updateActuallyPlace(Map<String, Object> mapValue);
 
-    int cancelMakeSure(Integer orderId);
+    int cancelMakeSure(Integer detailsId);
 
     int updateTruckDetails(Map<String,Object> map);
 

+ 14 - 7
src/main/java/com/steerinfo/dil/service/impl/BmstruckDetailsOrderServiceImpl.java

@@ -1117,10 +1117,10 @@ public class BmstruckDetailsOrderServiceImpl implements IBmstruckDetailsOrderSer
 
 
     @Override
-    public int updateDetailsStatus(List<Integer> mapList) {
+    public int updateDetailsStatus(List<Integer> detailsOrderList) {
         int i = 0;
-        for(Integer orderId :mapList) {
-            if(orderId == null) {
+        for(Integer detailsId :detailsOrderList) {
+            if(detailsId == null) {
                 continue;
             }
             //BigDecimal detailId  = DataChange.dataToBigDecimal(map.get("detailId"));
@@ -1128,7 +1128,11 @@ public class BmstruckDetailsOrderServiceImpl implements IBmstruckDetailsOrderSer
             //bmstruckDetailsOrder.setDetailsId(detailId);
             //bmstruckDetailsOrder.setWetherToStatement(new BigDecimal(1));
             //i += bmstruckDetailsOrderMapper.updateByPrimaryKeySelective(bmstruckDetailsOrder);
-            i += bmstruckDetailsOrderMapper.updateDetailsStatus(orderId);
+            try {
+                i += bmstruckDetailsOrderMapper.updateDetailsStatus(detailsId);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
             /*BigDecimal priceId = omstruckOrderMapper.getPriceId(orderId);
             omstruckOrderMapper.modifyOldTime(priceId,new Date());*/
         }
@@ -1170,15 +1174,18 @@ public class BmstruckDetailsOrderServiceImpl implements IBmstruckDetailsOrderSer
         return 0;
     }
 
-    public int cancelMakeSure(List<Integer> mapList) {
+    public int cancelMakeSure(List<Integer> detailsOrderList) {
         int i = 0;
-        for(Integer orderId :mapList) {
+        for(Integer detailsId :detailsOrderList) {
+            if(detailsId == null) {
+                continue;
+            }
             //BigDecimal detailId  = DataChange.dataToBigDecimal(map.get("detailId"));
             //BmstruckDetailsOrder bmstruckDetailsOrder = new BmstruckDetailsOrder();
             //bmstruckDetailsOrder.setDetailsId(detailId);
             //bmstruckDetailsOrder.setWetherToStatement(new BigDecimal(1));
             //i += bmstruckDetailsOrderMapper.updateByPrimaryKeySelective(bmstruckDetailsOrder);
-            i += bmstruckDetailsOrderMapper.cancelMakeSure(orderId);
+            i += bmstruckDetailsOrderMapper.cancelMakeSure(detailsId);
             /*BigDecimal priceId = omstruckOrderMapper.getPriceId(orderId);
             omstruckOrderMapper.modifyOldTime(priceId,new Date());*/
         }

+ 4 - 3
src/main/resources/com/steerinfo/dil/mapper/BmstruckDetailsOrderMapper.xml

@@ -2512,7 +2512,7 @@
     <update id="updateDetailsStatus" parameterType="java.lang.Integer">
         UPDATE BMSTRUCK_DETAILS_ORDER BDO
         SET BDO.WETHER_TO_STATEMENT = 1
-        WHERE BDO.ORDER_ID = #{orderId}
+        WHERE BDO.DETAILS_ID = #{detailsId}
     </update>
     <select id="getSaleOrderStatus" resultType="java.lang.Integer">
         SELECT nvl(ASO.SALE_ORDER_STATUS,0)
@@ -2554,8 +2554,9 @@
     </update>
     <update id="cancelMakeSure" parameterType="java.lang.Integer">
         UPDATE BMSTRUCK_DETAILS_ORDER BDO
-        SET BDO.WETHER_TO_STATEMENT = 0
-        WHERE BDO.ORDER_ID = #{orderId}
+        SET BDO.WETHER_TO_STATEMENT = 0,
+            BDO.STATEMENT_ID = null
+        WHERE BDO.DETAILS_ID = #{detailsId}
     </update>
     <update id="updateTruckDetails">
         UPDATE BMSTRUCK_DETAILS_ORDER BDO