修改

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>org.example</groupId>
     <artifactId>dil-wms-api</artifactId>
-    <version>1.13</version>
+    <version>1.14</version>
 
     <parent>
         <groupId>org.springframework.boot</groupId>

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

@@ -21,6 +21,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.HashMap;
 import java.util.List;
@@ -171,6 +172,12 @@ public class OyeResultController extends BaseRESTfulController {
         }
         try {
             result = oyeResultService.insertOutboundResult(map);
+            if(map.get("orderId") != null) {
+                List<BigDecimal> orderIds = oyeRealtimeInventoryMapper.getUnReceiveOrder(DataChange.dataToBigDecimal(map.get("orderId")));
+                if (orderIds.size() > 0 && orderIds.get(0) != null) {
+                    oyeRealtimeInventoryMapper.closeOrder(DataChange.dataToBigDecimal(map.get("orderId")));
+                }
+            }
             try {
                 if(map.get("orderId") != null) {
                     bmsTruckFeign.addDetailsOrder(DataChange.dataToBigDecimal(map.get("orderId")));

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

@@ -43,4 +43,8 @@ public interface OyeRealtimeInventoryMapper extends IBaseMapper<OyeRealtimeInven
 
     List<Map<String, Object>> getInventoryInfo(Map<String, Object> map);
 
+    List<BigDecimal> getUnReceiveOrder(BigDecimal orderId);
+
+    int closeOrder(BigDecimal orderId);
+
 }

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

@@ -1024,5 +1024,21 @@
     </if>
     AND ORI.INBOUND_AREA = '欧冶库'
   </select>
-
+  <select id="getUnReceiveOrder" resultType="java.math.BigDecimal" parameterType="decimal">
+    SELECT OO.ORDER_ID FROM OMSTRUCK_ORDER OO
+    LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
+    ON ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
+    LEFT JOIN AMS_SALE_ORDER ASO
+    ON ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
+    WHERE ASO.SALE_TYPE = 50
+    AND OO.ORDER_TYPE = 1
+    AND OO.ORDER_STATUS = 4
+    AND OO.CAPACITY_ID = (SELECT CAPACITY_ID FROM OMSTRUCK_ORDER WHERE ORDER_ID = #{orderId})
+  </select>
+  <update id="closeOrder">
+    UPDATE OMSTRUCK_ORDER OO
+    SET OO.ORDER_STATUS = 2,
+        OO.INSERT_UPDATE_REMARK = '出库关闭运单'
+    where oo.ORDER_ID = #{orderId}
+  </update>
 </mapper>