16点05分hjj

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

@@ -35,15 +35,15 @@ public class RmsMaterialSteelController extends BaseRESTfulController {
     @ApiModelProperty(value = "得到没有质保书的炉号")
     @PostMapping("/getMaterialFurnaceNumber")
     public RESTfulResult getMaterialFurnaceNumber() {
-        Map<String,Object> mapValue = rmsMaterialSteelService.getMaterialFurnaceNumber();
-        return success(mapValue);
+        List<Map<String, Object>> mapList = rmsMaterialSteelService.getMaterialFurnaceNumber();
+        return success(mapList);
     }
 
 
     @PostMapping("/upload")
     @ResponseBody
-    public Map<String, String> upFile(@RequestParam("file") MultipartFile file, HttpServletRequest request) throws IOException {
-        return rmsMaterialSteelService.upFile(file, request);//这里调用service的upfile方法，传入两个参数。
+    public Map<String, String> upFile(@RequestParam("files") MultipartFile[] files, HttpServletRequest request) throws IOException {
+        return rmsMaterialSteelService.upFile(files, request);//这里调用service的upfile方法，传入两个参数。
     }
 
 }

src/main/java/com/steerinfo/dil/feign/IMFeign.java

@@ -7,7 +7,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.util.HashMap;
 
-@FeignClient(value = "DIL-IM-DEV", url = "172.16.33.161:8099")
+@FeignClient(value = "DIL-IM-DEV", url = "172.16.33.166:8055")
 public interface IMFeign {
     @PostMapping("/websocket/sendToUser")
     @ResponseBody

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

@@ -15,7 +15,7 @@ public interface AmsSaleOrderMapper extends IBaseMapper<AmsSaleOrder, BigDecimal
     Map<String, Object> getSaleOrderMessage(BigDecimal saleOrderId);
 
     // 得到销售订单下的所有车序号
-    List<Map<String, Object>> getTruckNo(BigDecimal saleOrderId);
+    List<Map<String, Object>> getMaterialMessages(BigDecimal saleOrderId);
 
     // 得到销售订单主键
     @Select("")

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

@@ -3,6 +3,7 @@ package com.steerinfo.dil.mapper;
 import com.steerinfo.dil.model.RmsMaterialSteel;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import java.math.*;
+import java.util.List;
 import java.util.Map;
 
 import org.apache.ibatis.annotations.Mapper;
@@ -10,7 +11,7 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface RmsMaterialSteelMapper extends IBaseMapper<RmsMaterialSteel, BigDecimal> {
     // 得到没有质保书的炉号
-    Map<String, Object> getMaterialFurnaceNumber();
+    List<Map<String, Object>> getMaterialFurnaceNumber();
 
     // 修改相应炉号的钢材质检结果
     Integer updateMaterialQuality(Map<String,Object> map);

src/main/java/com/steerinfo/dil/service/IRmsMaterialSteelService.java

@@ -4,6 +4,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -25,7 +26,7 @@ public interface IRmsMaterialSteelService {
      * 得到没有质保书的炉号
      * @return
      */
-    Map<String, Object> getMaterialFurnaceNumber();
+    List<Map<String, Object>> getMaterialFurnaceNumber();
 
     /**
      * 修改相应炉号的钢材质检结果
@@ -34,5 +35,5 @@ public interface IRmsMaterialSteelService {
      */
     Integer updateMaterialQuality(Map<String, Object> map);
 
-    Map<String, String> upFile(MultipartFile file, HttpServletRequest request) throws IOException;
+    Map<String, String> upFile(MultipartFile[] files, HttpServletRequest request) throws IOException;
 }

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

@@ -37,10 +37,12 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
      */
     @Override
     public Map<String, Object> getSaleOrder(BigDecimal saleOrderId) {
-        List<Map<String,Object>> truckNoList = amsSaleOrderMapper.getTruckNo(saleOrderId);
-        Map<String,Object> mapValue = amsSaleOrderMapper.getSaleOrderMessage(saleOrderId);
-        mapValue.put("truckNoList",truckNoList);
-        return mapValue;
+        List<Map<String,Object>> entries = amsSaleOrderMapper.getMaterialMessages(saleOrderId);
+        Map<String,Object> head = amsSaleOrderMapper.getSaleOrderMessage(saleOrderId);
+        Map<String,Object> input = new HashMap<>();
+        input.put("head",head);
+        input.put("entries",entries);
+        return input;
     }
 
     /**

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

@@ -11,6 +11,7 @@ import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -39,7 +40,7 @@ public class RmsMaterialSteelServiceImpl implements IRmsMaterialSteelService {
      * @return
      */
     @Override
-    public Map<String, Object> getMaterialFurnaceNumber() {
+    public List<Map<String, Object>> getMaterialFurnaceNumber() {
         return rmsMaterialSteelMapper.getMaterialFurnaceNumber();
     }
 
@@ -56,33 +57,35 @@ public class RmsMaterialSteelServiceImpl implements IRmsMaterialSteelService {
 
     /**
      * PDF文件上传
-     * @param file
+     * @param files
      * @param request
      * @return
      * @throws IOException
      */
     @Override
-    public Map<String, String> upFile(MultipartFile file, HttpServletRequest request) throws IOException {
+    public Map<String, String> upFile(MultipartFile[] files, HttpServletRequest request) throws IOException {
         Map<String, String> map = new HashMap<>();
         map.put("code", "500");
         map.put("msg", "上传文件失败");
-        String fileName = file.getOriginalFilename();//获取文件名
-        String suffixName = fileName.substring(fileName.lastIndexOf("."));//获取文件的后缀名
-        // 得到文件名的前缀
-        String capacityNumberAndFurnaceNumber = fileName.substring(0,fileName.lastIndexOf("."));
-        //上传的文件名也需要加上后缀，不然虚拟机不知道文件格式
-        InputStream inputStream = file.getInputStream();
-        String filePath = null;
-        //关于ftp处理文件上传下载这里单独写了一个工具类ftpUtil，下面会写这个类
-        //@Autowired  private FtpUtil ftpUtil;service层上面引入了这个方法。
-        Boolean flag = ftpUtil.uploadFile(fileName, inputStream);//主要就是这里实现了ftp的文件上传
-        if (flag == true) {
-            //log.info("上传文件成功!");
-            filePath = ftpUtil.FTP_BASEPATH + fileName;
-            map.put("code", "200");
-            map.put("msg", "上传文件成功");
+        for (MultipartFile file : files) {
+            String fileName = file.getOriginalFilename();//获取文件名
+            String suffixName = fileName.substring(fileName.lastIndexOf("."));//获取文件的后缀名
+            // 得到文件名的前缀
+            String capacityNumberAndFurnaceNumber = fileName.substring(0, fileName.lastIndexOf("."));
+            //上传的文件名也需要加上后缀，不然虚拟机不知道文件格式
+            InputStream inputStream = file.getInputStream();
+            String filePath = null;
+            //关于ftp处理文件上传下载这里单独写了一个工具类ftpUtil，下面会写这个类
+            //@Autowired  private FtpUtil ftpUtil;service层上面引入了这个方法。
+            Boolean flag = ftpUtil.uploadFile(fileName, inputStream);//主要就是这里实现了ftp的文件上传
+            if (flag == true) {
+                //log.info("上传文件成功!");
+                filePath = ftpUtil.FTP_BASEPATH + fileName;
+                map.put("code", "200");
+                map.put("msg", "上传文件成功");
+            }
+            map.put("path", filePath);
         }
-        map.put("path", filePath);
         System.out.println(map);
         return map;
     }

src/main/resources/bootstrap.yml

@@ -16,7 +16,7 @@ spring:
 eureka:
   client:
     service-url:
-      defaultZone: http://root:root@${EUREKA_HOST:172.16.33.161}:${EUREKA_PORT:8061}/eureka/
+      defaultZone: http://root:root@${EUREKA_HOST:172.16.33.162}:${EUREKA_PORT:8081}/eureka/
   instance:
     prefer-ip-address: true
     status-page-url: http://${spring.cloud.client.ip-address}:${server.port}/swagger-ui.html#/

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

@@ -610,20 +610,28 @@
 
     <!-- 得到销售订单信息 -->
     <select id="getSaleOrderMessage" parameterType="DECIMAL" resultType="java.util.Map">
-        SELECT ASO.SALE_NUMBER           AS "number",
+        SELECT ASO.SALE_NUMBER   AS "number",
                RC.CONSIGNEE_CODE AS "cusNum",
-                ASO.INSERT_TIME AS "bizDate"
+               RSH.SHIPPER_NAME  AS "unitName",
+               ASO.INSERT_TIME   AS "bizDate",
+               ASO.SALE_REMARK   AS "remark"
         FROM AMS_SALE_ORDER ASO
                  LEFT JOIN RMS_CONSIGNEE RC
                            ON RC.CONSIGNEE_ID = ASO.RECEIVE_ID
-                 LEFT JOIN AMS_SALE_PLAN ASP
-                           ON ASP.PLAN_ID = ASO.PLAN_ID
+                 LEFT JOIN RMS_SHIPPER RSH
+                           ON RSH.SHIPPER_ID = ASO.SHIPPER_ID
+        WHERE ASO.SALE_ORDER_ID = #{saleOrderId}
     </select>
 
     <!-- 得到订单下的车序号 -->
-    <select id="getTruckNo" parameterType="DECIMAL" resultType="java.util.Map">
-        SELECT ASOM.SALE_ORDER_MATERIAL_TRUCK_NO AS "saleOrderMaterialTruckNo"
+    <select id="getMaterialMessages" parameterType="DECIMAL" resultType="java.util.Map">
+        SELECT RM.MATERIAL_CODE                AS "materialNum",
+               ASTM.SALE_ORDER_MATERIAL_NUMBER AS "qty"
         FROM AMS_SALE_ORDER_MATERIAL ASOM
+                 LEFT JOIN AMS_SALE_TRUCKNO_MATERIAL ASTM
+                           ON ASTM.TRUCKNO_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
+                 LEFT JOIN RMS_MATERIAL RM
+                           ON RM.MATERIAL_ID = ASTM.MATERIAL_ID
         WHERE ASOM.SALE_ORDER_ID = #{saleOrderId}
     </select>
 </mapper>