关务推送bug；

mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderApplicationService.java

@@ -2060,8 +2060,10 @@ public class ReservationStockInOrderApplicationService {
                 CloseableHttpResponse response = httpClient.execute(httpPost);
                 String responseString = EntityUtils.toString(response.getEntity());
                 gwLog.setResponseBody(responseString);
-
+// 直接转Map<String, Object>
-                if (response.getStatusLine().getStatusCode() == 200) {
+                Map<String, Object> map = JSON.parseObject(responseString);
+                Integer code = (Integer) map.get("code");
+                if (response.getStatusLine().getStatusCode() == 200&&code == 200) {
                     gwLog.setStatus(2);
                     updatePushStatus(id, 3, new Date(), pushBy,pushByName);
                     successCount++;

mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderApplicationService.java

@@ -1471,8 +1471,10 @@ public class ReservationStockOutOrderApplicationService {
                 CloseableHttpResponse response = httpClient.execute(httpPost);
                 String responseString = EntityUtils.toString(response.getEntity());
                 gwLog.setResponseBody(responseString);
-
+                // 直接转Map<String, Object>
-                if (response.getStatusLine().getStatusCode() == 200) {
+                Map<String, Object> map = JSON.parseObject(responseString);
+                Integer code = (Integer) map.get("code");
+                if (response.getStatusLine().getStatusCode() == 200&&code ==200) {
                     gwLog.setStatus(2);
                     updatePushStatus(id, 3, new Date(), pushBy,pushByName);
                     successCount++;

mhd_wms/src/main/java/com/mhd/wms/application/service/pickingOrder/PickingOrderApplicationService.java

@@ -923,8 +923,10 @@ public class PickingOrderApplicationService {
                 CloseableHttpResponse response = httpClient.execute(httpPost);
                 String responseString = EntityUtils.toString(response.getEntity());
                 gwLogDTO.setResponseBody(responseString);
-
+                // 直接转Map<String, Object>
-                if (response.getStatusLine().getStatusCode() == 200) {
+                Map<String, Object> map = JSON.parseObject(responseString);
+                Integer code = (Integer) map.get("code");
+                if (response.getStatusLine().getStatusCode() == 200&&code==200) {
                     gwLogDTO.setStatus(2);
                     updatePushStatus(id, 3, new Date(), pushBy,pushByName);
                     successCount++;

mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java

@@ -2405,8 +2405,11 @@ public class StockInOrderApplicationService {
                 CloseableHttpResponse response = httpClient.execute(httpPost);
                 String responseString = EntityUtils.toString(response.getEntity());
                 gwLogDTO.setResponseBody(responseString);
+                // 直接转Map<String, Object>
+                Map<String, Object> map = JSON.parseObject(responseString);
+                Integer code = (Integer) map.get("code");
 
-                if (response.getStatusLine().getStatusCode() == 200) {
+                if (response.getStatusLine().getStatusCode() == 200&&code == 200) {
                     gwLogDTO.setStatus(2);
                     updatePushStatus(id, 3, new Date(), pushBy,pushByName);
                     successCount++;

mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java

@@ -1682,8 +1682,10 @@ public class StockOutOrderApplicationService {
                 CloseableHttpResponse response = httpClient.execute(httpPost);
                 String responseString = EntityUtils.toString(response.getEntity());
                 gwLogDTO.setResponseBody(responseString);
-
+                // 直接转Map<String, Object>
-                if (response.getStatusLine().getStatusCode() == 200) {
+                Map<String, Object> map = JSON.parseObject(responseString);
+                Integer code = (Integer) map.get("code");
+                if (response.getStatusLine().getStatusCode() == 200&&code==200) {
                     gwLogDTO.setStatus(2);
                     updatePushStatus(id, 3, new Date(), pushBy,pushByName);
                     successCount++;

mhd_wms/src/main/java/com/mhd/wms/application/service/stockShelfOrder/StockShelfOrderApplicationService.java

@@ -2859,8 +2859,10 @@ public class StockShelfOrderApplicationService {
                 CloseableHttpResponse response = httpClient.execute(httpPost);
                 String responseString = EntityUtils.toString(response.getEntity());
                 gwLogDTO.setResponseBody(responseString);
-
+// 直接转Map<String, Object>
-                if (response.getStatusLine().getStatusCode() == 200) {
+                Map<String, Object> map = JSON.parseObject(responseString);
+                Integer code = (Integer) map.get("code");
+                if (response.getStatusLine().getStatusCode() == 200&&code == 200) {
                     gwLogDTO.setStatus(2);
                     updatePushStatus(id, 3, new Date(), pushBy,pushByName);
                     successCount++;

mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/todo/StockInOrderDO.java

@@ -410,4 +410,13 @@ public class StockInOrderDO extends BaseVOEntity {
 
     @ApiModelProperty("推送人姓名")
     private String pushByName;
+    @ApiModelProperty(value = "推送时间起")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date pushTimeStart;
+
+    @ApiModelProperty(value = "推送时间止")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date pushTimeEnd;
 }

mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockInOrder/StockInOrderDTO.java

@@ -408,4 +408,13 @@ public class StockInOrderDTO extends StockInOrderBaseDTO {
 
     @ApiModelProperty("推送人姓名")
     private String pushByName;
+    @ApiModelProperty(value = "推送时间起")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date pushTimeStart;
+
+    @ApiModelProperty(value = "推送时间止")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date pushTimeEnd;
 }

mhd_wms/src/main/resources/mapper/stockInOrder/StockInOrderMapper.xml

@@ -418,6 +418,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="createTimeEnd != null and createTimeEnd != ''">
             and date_format(a.create_time,'%Y-%m-%d') &lt;= #{createTimeEnd}
         </if>
+        <if test="pushTimeEnd != null">
+            and PUSH_TIME <![CDATA[<=]]> #{pushTimeEnd}
+        </if>
+        <if test="pushStatus != null">
+            and a.PUSH_STATUS = #{pushStatus}
+        </if>
+        <if test="pushStatus != null">
+            and a.PUSH_STATUS = #{pushStatus}
+        </if>
         <!-- 入库明细：物料名称、物料编码（同一明细行同时满足；与计划数量汇总口径一致）。关联 material_base_info 避免明细冗余名称与主档不一致时筛不到 -->
         <if test="(materialName != null and materialName != '') or (materialCode != null and materialCode != '')">
             and exists (