Merge remote-tracking branch 'origin/master'

src/main/java/com/steerinfo/dil/controller/AmsSaleOrderController.java

@@ -208,7 +208,7 @@ public class AmsSaleOrderController extends BaseRESTfulController {
 
     /**
      * 通过主键删除销售订单
-     * @param saleOrderId
+     * @param saleOrderIds
      * @return
      */
     @ApiOperation(value="通过主键删除销售订单")
@@ -216,8 +216,14 @@ public class AmsSaleOrderController extends BaseRESTfulController {
             @ApiImplicitParam(name = "saleOrderId", value = "主键Id", required = false, dataType = "java.math.BigDecimal")
     })
     @PostMapping(value = "/deleteAmsSaleOrderBySaleOrderId")
-    public RESTfulResult deleteAmsSaleOrderBySaleOrderId(BigDecimal saleOrderId){
-        int i = amsSaleOrderService.deleteAmsSaleOrderBySaleOrderId(saleOrderId);
+    public RESTfulResult deleteAmsSaleOrderBySaleOrderId(@RequestBody(required = false)List<Map<String,Object>> saleOrderIds) throws Exception {
+        if(saleOrderIds==null || saleOrderIds.size()<=0){
+            return failed("没有选中数据");
+        }
+        int i = 0;
+        for(Map<String,Object> temp:saleOrderIds){
+            i += amsSaleOrderService.deleteAmsSaleOrderBySaleOrderId(DataChange.dataToBigDecimal(temp.get("saleOrderId")));
+        }
         return success(i);
     }
 
@@ -1504,6 +1510,7 @@ public class AmsSaleOrderController extends BaseRESTfulController {
 
     @ApiOperation("批量新增销售订单")
     @PostMapping("addSteelSaleOrderList")
+    @Transactional(rollbackFor = Exception.class)
     public RESTfulResult addSteelSaleOrderList(@RequestBody List<Map<String,Object>> mapList){
         int count = 0;
         String saleOrderNo = null;

src/main/resources/com/steerinfo/dil/mapper/AmsSaleOrderMapper.xml

@@ -4602,7 +4602,6 @@
            LEFT JOIN TMSTRUCK_ARRIVAL_RESULT  TAR ON TAR.RESULT_TOTAL_ID=TTR.RESULT_TOTAL_ID
            LEFT JOIN TMSTRUCK_RECEIPT_RESULT TRR ON TRR.RESULT_TOTAL_ID=TTR.RESULT_TOTAL_ID
     where RC.CAPACITY_NUMBER=#{capacityNumber} and OO.order_status=5
-    and oo.order_type = 1
       fetch next 1 rows only
   </select>
   <select id="getOrderMes" resultType="java.util.Map" parameterType="java.util.Map">