盘点反馈修改

pom.xml

@@ -49,6 +49,12 @@
 			<scope>test</scope>
 		</dependency>
 		<dependency>
+			<groupId>com.google.code.gson</groupId>
+			<artifactId>gson</artifactId>
+			<version>2.6.2</version>
+		</dependency>
+
+		<dependency>
 			<groupId>org.codehaus.jackson</groupId>
 			<artifactId>jackson-mapper-asl</artifactId>
 			<version>1.9.13</version>

src/main/java/com/mushiny/heli/xnr/comm/JsonUtils.java

@@ -18,7 +18,6 @@ public class JsonUtils {
 
     public static <T> String bean2Json(T bean) {
         try {
-
             return objectMapper.writeValueAsString(bean);
         } catch (Exception e) {
             e.printStackTrace();

src/main/java/com/mushiny/heli/xnr/dto/IcqaOrderDTO.java

@@ -9,7 +9,7 @@ import java.util.List;
  * Created by Lisi on 2019-12-17.
  */
 public class IcqaOrderDTO implements java.io.Serializable {
-    @JsonProperty("ICQAID")
+    @JsonProperty("TASKID")
     private String TASKID;
     @JsonProperty("TIMES")
     private Integer TIMES;

src/main/java/com/mushiny/heli/xnr/dto/IcqaOrderPositionRespHeliDto.java

+package com.mushiny.heli.xnr.dto;
+
+import org.codehaus.jackson.annotate.JsonIgnore;
+import org.codehaus.jackson.annotate.JsonProperty;
+
+import java.io.Serializable;
+
+public class IcqaOrderPositionRespHeliDto implements Serializable {
+    @JsonProperty("SKUID")
+    private String SKUID;
+    @JsonProperty("AMOUNT")
+    private Integer AMOUNT;
+    @JsonProperty("COUNT")
+    private Integer COUNT;
+
+    @JsonIgnore
+    public Integer getCOUNT() {
+        return COUNT;
+    }
+    @JsonIgnore
+    public void setCOUNT(Integer COUNT) {
+        this.COUNT = COUNT;
+    }
+    @JsonIgnore
+    public String getSKUID() {
+        return SKUID;
+    }
+    @JsonIgnore
+    public void setSKUID(String SKUID) {
+        this.SKUID = SKUID;
+    }
+    @JsonIgnore
+    public Integer getAMOUNT() {
+        return AMOUNT;
+    }
+    @JsonIgnore
+    public void setAMOUNT(Integer AMOUNT) {
+        this.AMOUNT = AMOUNT;
+    }
+}

src/main/java/com/mushiny/heli/xnr/dto/IcqaOrderRespHeliDto.java

+package com.mushiny.heli.xnr.dto;
+
+import org.codehaus.jackson.annotate.JsonProperty;
+
+import java.util.List;
+
+public class IcqaOrderRespHeliDto implements java.io.Serializable {
+
+    @JsonProperty("ICQAID")
+    private String ICQAID;
+    @JsonProperty("FACTORY")
+    private String FACTORY;
+    @JsonProperty("SECTION")
+    private String SECTION;
+    @JsonProperty("CREATED_DATE")
+    private String CREATED_DATE;
+    @JsonProperty("DATA")
+    List<IcqaOrderPositionRespHeliDto> DATA;
+
+    public String getICQAID() {
+        return ICQAID;
+    }
+
+    public void setICQAID(String ICQAID) {
+        this.ICQAID = ICQAID;
+    }
+
+    public String getFACTORY() {
+        return FACTORY;
+    }
+
+    public void setFACTORY(String FACTORY) {
+        this.FACTORY = FACTORY;
+    }
+
+    public String getSECTION() {
+        return SECTION;
+    }
+
+    public void setSECTION(String SECTION) {
+        this.SECTION = SECTION;
+    }
+
+    public String getCREATED_DATE() {
+        return CREATED_DATE;
+    }
+
+    public void setCREATED_DATE(String CREATED_DATE) {
+        this.CREATED_DATE = CREATED_DATE;
+    }
+
+    public List<IcqaOrderPositionRespHeliDto> getDATA() {
+        return DATA;
+    }
+
+    public void setDATA(List<IcqaOrderPositionRespHeliDto> DATA) {
+        this.DATA = DATA;
+    }
+}

src/main/java/com/mushiny/heli/xnr/dto/ItemDTO.java

@@ -27,8 +27,8 @@ public class ItemDTO implements Serializable {
     @JsonProperty("HEIGHT")
     private Integer HEIGHT;
 
-    @JsonProperty("STATUS")
-    private Integer STATUS;
+    @JsonProperty("TATUS")
+    private Integer TATUS;
 
     @JsonProperty("FACTORY")
     private String FACTORY;
@@ -79,11 +79,11 @@ public class ItemDTO implements Serializable {
     }
     @JsonIgnore
     public Integer getSTATUS() {
-        return STATUS;
+        return TATUS;
     }
     @JsonIgnore
     public void setSTATUS(Integer STATUS) {
-        this.STATUS = STATUS;
+        this.TATUS = STATUS;
     }
     @JsonIgnore
     public String getFACTORY() {

src/main/java/com/mushiny/heli/xnr/service/WMSRespService.java

 package com.mushiny.heli.xnr.service;
 
+import com.alibaba.fastjson.JSON;
+import com.google.gson.Gson;
 import com.mushiny.heli.xnr.beans.BaseBpo;
 import com.mushiny.heli.xnr.comm.CommonUtils;
 import com.mushiny.heli.xnr.comm.JsonUtils;
@@ -19,10 +21,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.client.RestTemplate;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 /**
  * Created by Lisi on 2019-11-18.
@@ -30,7 +30,8 @@ import java.util.Map;
 @Service
 public class WMSRespService {
     private final static Logger logger = LoggerFactory.getLogger(WMSRespService.class);
-
+    private SimpleDateFormat OrderDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+    private static Gson gson = new Gson();
     public static final String SQL_QUERYALL_INBOUNDORDER =
             "SELECT * FROM WMS_INBOUND_ORDER ,WMS_INBOUND_ORDERPOSITION " +
             "WHERE WMS_INBOUND_ORDER.ENTRYID=WMS_INBOUND_ORDERPOSITION.ENTRYID " +
@@ -87,20 +88,23 @@ public class WMSRespService {
 
         List<Map> data = this.jdbcRepository.queryBySql(SQL_QUERYALL_ICQAORDER,FINISH);
         List<IcqaOrderDTO> data2 = this.transfer2IcqaDTO(data);//合并主表记录
+        List<IcqaOrderRespHeliDto> icqaOrderRespHeliDtos = this.transfer2IcqaOrderRespHeliDto(data2);
         for (int i = 0; i < data2.size(); i++) {
-            IcqaOrderDTO icqaOrderDTO = data2.get(i);
-            String json = JsonUtils.bean2Json(icqaOrderDTO);
+            //IcqaOrderDTO icqaOrderDTO = data2.get(i);
+            IcqaOrderRespHeliDto icqaOrderRespHeliDto = icqaOrderRespHeliDtos.get(i);
+            //String json = JsonUtils.bean2Json(icqaOrderRespHeliDto);
+            String json = gson.toJson(icqaOrderRespHeliDto);
             logger.debug("post data: " + json);
             HttpEntity<String> httpEntity = new HttpEntity<String>(json, headers);
             ResponseEntity<String> res = restTemplate.postForEntity(this.icqaResp_url, httpEntity, String.class);
             Map result = JsonUtils.json2Map(res.getBody());
             logger.debug("result: " + result);
             if(CommonUtils.parseInteger("CODE",result) == 0){
-                logger.debug("成功回调"+icqaOrderDTO.getTASKID());
+                logger.debug("成功回调"+icqaOrderRespHeliDto.getICQAID());
                 Map newValue = new HashMap();
                 newValue.put("NEED_RESP",2);
                 Map con = new HashMap();
-                con.put("TASKID",icqaOrderDTO.getTASKID());
+                con.put("TASKID",icqaOrderRespHeliDto.getICQAID());
                 this.jdbcRepository.updateRecords(TABLE_ICQAORDER,newValue,con);
             }
         }
@@ -120,6 +124,37 @@ public class WMSRespService {
         }
     }
 
+
+//    public static void main(String[] args) {
+//        IcqaOrderRespHeliDto icqaOrderRespHeliDto = new IcqaOrderRespHeliDto();
+//        icqaOrderRespHeliDto.setFACTORY("1111111");
+//        Gson gson = new Gson();
+//        String s1 = gson.toJson(icqaOrderRespHeliDto);
+//        String s = JsonUtils.bean2Json(icqaOrderRespHeliDto);//JSON.toJSONString(icqaOrderRespHeliDto);
+//        System.out.println(s1);
+//    }
+    private List<IcqaOrderRespHeliDto> transfer2IcqaOrderRespHeliDto(List<IcqaOrderDTO> list){
+        List<IcqaOrderRespHeliDto> icqaOrderRespHeliDtos = new ArrayList<IcqaOrderRespHeliDto>();
+        for (IcqaOrderDTO icqaOrderDTO: list
+             ) {
+            IcqaOrderRespHeliDto icqaOrderRespHeliDto = new IcqaOrderRespHeliDto();
+            icqaOrderRespHeliDto.setICQAID(icqaOrderDTO.getTASKID());
+            icqaOrderRespHeliDto.setFACTORY(icqaOrderDTO.getFACTORY());
+            icqaOrderRespHeliDto.setSECTION(icqaOrderDTO.getSECTION());
+            icqaOrderRespHeliDto.setCREATED_DATE(OrderDateFormat.format(new Date()));
+            List<IcqaOrderPositionRespHeliDto> icqaOrderPositionRespHeliDtos = new ArrayList<IcqaOrderPositionRespHeliDto>();
+            for (IcqaOrderPosition icqaOrderPosition:icqaOrderDTO.getDATA()){
+                IcqaOrderPositionRespHeliDto icqaOrderPositionRespHeliDto = new IcqaOrderPositionRespHeliDto();
+                icqaOrderPositionRespHeliDto.setSKUID(icqaOrderPosition.getSKUID());
+                icqaOrderPositionRespHeliDto.setAMOUNT(icqaOrderPosition.getAMOUNT());
+                icqaOrderPositionRespHeliDto.setCOUNT(icqaOrderPosition.getCOUNT());
+                icqaOrderPositionRespHeliDtos.add(icqaOrderPositionRespHeliDto);
+            }
+            icqaOrderRespHeliDto.setDATA(icqaOrderPositionRespHeliDtos);
+            icqaOrderRespHeliDtos.add(icqaOrderRespHeliDto);
+        }
+        return icqaOrderRespHeliDtos;
+    }
     private List<IcqaOrderDTO> transfer2IcqaDTO(List<Map> data) {
         //return new ArrayList<>();
         Map<String,IcqaOrderDTO> temp = new HashMap();
@@ -254,12 +289,12 @@ public class WMSRespService {
 
         for (int i = 0; i < data.size(); i++) {
             Map map = data.get(i);
-            String entryId = (String) map.get("ENTRYID");
+            String entryId = (String) map.get("ORDERID");
             if(temp.get(entryId) == null){
                 OutboundOrderDTO outboundOrderDTO = new OutboundOrderDTO();
                 outboundOrderDTO.setORDERID(entryId);
-                outboundOrderDTO.setSECTION((String) map.get("SECTION"));
-                outboundOrderDTO.setFACTORY((String) map.get("FACTORY"));
+                outboundOrderDTO.setSECTION((String) map.get("SECTION_ID"));//TODO
+                outboundOrderDTO.setFACTORY((String) map.get("WAREHOUSE_ID"));//TODO
                 outboundOrderDTO.setTIMES(CommonUtils.parseInteger("TIMES",map));
                 outboundOrderDTO.setDATA(new ArrayList<>());
                 temp.put(entryId,outboundOrderDTO);

src/main/java/com/mushiny/heli/xnr/service/WMSService.java

@@ -245,7 +245,7 @@ public class WMSService {
         order.addKV("TASKID", orderId);
         //order.addKV("CREATED_DATE",new Date(System.currentTimeMillis()));
         //order.addKV("FACTORY",CommonUtils.parseString("FACTORY",data));
-        order.addKV("SECTION_ID",CommonUtils.getClient(CommonUtils.parseString("SECTION",data)))
+        order.addKV("SECTION_ID",CommonUtils.getSection(CommonUtils.parseString("SECTION",data)))
                 .addKV("WAREHOUSE_ID",CommonUtils.getWarehouse(CommonUtils.parseString("FACTORY",data)));
         order.addKV("STATE",Sql_Table.AVAILABLE);
         order.addKV("NEED_RESP", 0);