修改销售钢材

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,7 +1510,7 @@ public class AmsSaleOrderController extends BaseRESTfulController {
 
     @ApiOperation("批量新增销售订单")
     @PostMapping("addSteelSaleOrderList")
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public RESTfulResult addSteelSaleOrderList(@RequestBody List<Map<String,Object>> mapList){
         int count = 0;
         String saleOrderNo = null;
@@ -1517,9 +1523,6 @@ public class AmsSaleOrderController extends BaseRESTfulController {
                 saleOrderNo = map.get("saleOrderNo").toString();
                     count++;
                     int saleOrderId= amsSaleOrderService.addSteelSaleOrder(map);
-                    if (map.get("isUploadEas") != null) {
-                        amsSaleOrderService.uploadSaleOrder(new BigDecimal(saleOrderId));
-                    }
                 }
         } catch (Exception e) {
             return failed("销售订单编号为:" + saleOrderNo + e.getMessage());

src/main/java/com/steerinfo/dil/mapper/AmsSaleOrderMapper.java

@@ -92,6 +92,10 @@ public interface AmsSaleOrderMapper extends IBaseMapper<AmsSaleOrder, BigDecimal
     Map<String, Object> getPriceByCarrierAndPlace(Map<String, Object> mapValue);
 
     List<Map<String, Object>> getSaleOrderListToCarrier(Map<String, Object> mapValue);
+
+    //查询出地址
+    String getshippingAddress(BigDecimal saleShippingAddressId);
+
     // 展示未匹配承运商的车序号
     List<Map<String, Object>> getSteelTruckNoList(Map<String, Object> mapValue);
     // 车序号下的物资

src/main/java/com/steerinfo/dil/service/impl/AmsSaleOrderMaterialServiceImpl.java

@@ -919,8 +919,13 @@ public class AmsSaleOrderMaterialServiceImpl implements IAmsSaleOrderMaterialSer
         HashMap<Object, Object> sendMap = new HashMap<>();
         //将消息实体放入list中存到map中
         sendMap.put("messages", list);
-        String s = imFeign.sendToUser(sendMap);
-        System.out.println(s);
+        String s = null;
+        try {
+            s = imFeign.sendToUser(sendMap);
+            System.out.println(s);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
         return s;
     }
 

src/main/java/com/steerinfo/dil/service/impl/AmsSaleOrderServiceImpl.java

@@ -1211,6 +1211,15 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
     @Override
     public List<Map<String, Object>> getSaleOrderListToCarrier(Map<String, Object> map) {
         List<Map<String, Object>> resultList = amsSaleOrderMapper.getSaleOrderListToCarrier(map);
+        if (resultList.isEmpty()){
+
+        }else {
+            for (Map<String, Object> stringObjectMap : resultList) {
+                BigDecimal saleShippingAddressId = (BigDecimal) stringObjectMap.get("saleShippingAddressId");
+                String address = amsSaleOrderMapper.getshippingAddress(saleShippingAddressId);
+                stringObjectMap.put("saleShippingAddress",address);
+            }
+        }
         return resultList;
     }
 

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

@@ -2580,7 +2580,8 @@
     RM.MATERIAL_MODEL "materialModel",
     RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL "specificationModel",
     ASM.MATERIAL_NUMBER "materialNumber",
-    RM.MATERIAL_NAME || RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL "nameSpecificationModel"
+    RM.MATERIAL_NAME || RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL "nameSpecificationModel",
+    ASOM.SALE_SHIPPING_ADDRESS_ID "saleShippingAddressId"
     from AMS_SALE_ORDER a_s_order
     left join RMS_SHIPPER r_shipper
     on a_s_order.SHIPPER_ID=r_shipper.SHIPPER_ID
@@ -2722,6 +2723,18 @@
     order by "updateTime" DESC
   </select>
 
+  <select id="getshippingAddress" resultType="java.lang.String">
+     select
+     distinct
+     RRA.ADDRESS_PROVINCE||RRA.ADDRESS_DISTRICT||RRA.ADDRESS_TOWN
+     ||RRP.ADDRESS_DELIVERY_ADDRESS "saleShippingAddress" FROM AMS_SALE_ORDER_MATERIAL ASOM
+        LEFT JOIN RMS_RECEIVE_PLACE RRP
+        ON RRP.PLACE_ID=ASOM.SALE_SHIPPING_ADDRESS_ID
+        LEFT JOIN RMS_RECEIVE_ADDRESS RRA
+        ON RRA.ADDRESS_ID=RRP.ADDRESS_ID
+        WHERE ASOM.SALE_SHIPPING_ADDRESS_ID = #{saleShippingAddressId}
+  </select>
+
   <select id="getSaleOrderListByCarrierSsoId" resultType="java.util.Map">
     select * from(
     select a_s_order.SALE_ORDER_ID "saleOrderId",
@@ -4588,7 +4601,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">

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

@@ -453,8 +453,8 @@
   <select id="getMaterialId" resultType="java.math.BigDecimal" parameterType="map">
     select RM.MATERIAL_ID from RMS_MATERIAL RM
     where rm.MATERIAL_NAME = '钢坯'
-    AND RM.MATERIAL_SPECIFICATION = #{type}
-    AND RM.MATERIAL_MODEL = #{model}
+    AND RM.MATERIAL_SPECIFICATION = #{model}
+    AND RM.MATERIAL_MODEL = #{type}
   </select>
      <select id="getRequirementMaterial" resultType="java.util.Map" >
         select rw1.warehouse_name "unloadName",

src/main/resources/log4j.properties

@@ -1,5 +1,5 @@
 ## LOG4J配置
-log4j.rootCategory=INFO,stdout,file,RUNNING,errorfile
+log4j.rootCategory=INFO,file,RUNNING,errorfile,stdout
 ## 控制台输出
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout