tijiaoi

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

@@ -689,6 +689,7 @@ public class AmsSaleOrderController extends BaseRESTfulController {
     @ApiModelProperty(value = "新增钢材销售订单")
     @PostMapping("/addSteelSaleOrder")
     public RESTfulResult addSteelSaleOrder(@RequestBody Map<String,Object> mapValue){
+        System.out.println(mapValue);
         try {
             // 成功
             int result = amsSaleOrderService.addSteelSaleOrder(mapValue);
@@ -1315,6 +1316,9 @@ public class AmsSaleOrderController extends BaseRESTfulController {
     public RESTfulResult addSteelSaleOrderList(@RequestBody List<Map<String,Object>> mapList){
         int count = 0;
         String saleOrderNo = null;
+        System.out.println("------销售订单批量导入Excel导入-----");
+        System.out.println(mapList);
+        System.out.println("------销售订单批量导入Excel导入-----");
         try {
             for (Map<String,Object> map:mapList
                  ) {

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

@@ -1298,7 +1298,7 @@
         RW1.WAREHOUSE_NAME        "loadPointName",
         rm.material_id            "materialId",
         AIP.PLAN_STATUS           "planStatus",
-        RM.MATERIAL_NAME          "materialName",
+        RM.MATERIAL_NAME || RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL         "materialName",
         RCR.CARRIER_NAME          "carrierName",
         AIP.PLAN_EABLE_STATUS     "enable",
         AIP.PLAN_EABLE_STATUS     "enable1",