luobang пре 2 година
родитељ
комит
92b95d01ad

+ 5 - 5
src/main/java/com/steerinfo/dil/controller/AmsSaleOrderController.java

@@ -85,11 +85,11 @@ public class AmsSaleOrderController extends BaseRESTfulController {
      * @param mapVal
      * @return
      */
-//    @PostMapping("/test")
-//    public RESTfulResult test(@RequestBody Map<String, Object> mapVal) {
-//        int result = amsSaleOrderService.testContinue(mapVal);
-//        return success(result);
-//    }
+    @PostMapping("/test")
+    public RESTfulResult test(@RequestBody Map<String, Object> mapVal) {
+        int result = amsSaleOrderService.testContinue(mapVal);
+        return success(result);
+    }
     /**
      * 查询车牌号和金蝶分录
      *

+ 11 - 0
src/main/java/com/steerinfo/dil/controller/TmstruckWeightResultController.java

@@ -167,4 +167,15 @@ public class TmstruckWeightResultController extends BaseRESTfulController {
         }
         return success(s);
     }
+
+    @PostMapping("/queryApoByOrderNo")
+    public String queryApoByOrderNo(@RequestParam String orderNo){
+        String s = null;
+        try {
+            s = tmstruckWeightResultServiceImpl.queryApoByOrderNo(orderNo);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return s;
+    }
 }

+ 6 - 0
src/main/java/com/steerinfo/dil/mapper/TmstruckWeightResultMapper.java

@@ -159,4 +159,10 @@ public interface TmstruckWeightResultMapper extends IBaseMapper<TmstruckWeightRe
 
     Map<String, Object> getWeightMesBySaleMaterialId(BigDecimal saleMaterialId);
 
+    String queryApoByOrderNo(String orderNo);
+
+    Integer queryOrderType(String orderNo);
+
+    String queryApoInwardByOrderNo(String orderNo);
+
 }

+ 2 - 0
src/main/java/com/steerinfo/dil/service/ITmstruckWeightResultService.java

@@ -41,4 +41,6 @@ public interface ITmstruckWeightResultService {
     String receiveTmsTruckWeightResultByDaXing(List<Map<String, Object>> mapList);
 
     Boolean checkOrder(Map<String, Object> map);
+
+    String queryApoByOrderNo(String orderNo);
 }

+ 23 - 0
src/main/java/com/steerinfo/dil/service/impl/TmstruckWeightResultServiceImpl.java

@@ -80,6 +80,12 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
     //老厂区需要给金蝶回传的数据订单类型
     final private List<Integer> judgeToKDTypeList = Arrays.asList(5,6,7,8,17,18,23,20);
 
+    //纯采购订单类型
+    final private List<Integer> apoOrderType = Arrays.asList(5,6,7,17,18);
+
+    //采购内转订单类型
+    final private List<Integer> apoInwardOrderType = Arrays.asList(10,15,16,23,24,20);
+
     Logger logger = LoggerFactory.getLogger(getClass());
 
     /**
@@ -1080,4 +1086,21 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
         omstruckOrderMapper.updateByPrimaryKeySelective(omstruckOrder);
         return result;
     }
+
+    @Override
+    public String queryApoByOrderNo(String orderNo) {
+
+        //
+        //首先判断订单类型
+        Integer orderType = tmstruckWeightResultMapper.queryOrderType(orderNo);
+        String apo = null;
+        if(apoOrderType.contains(orderType)) {
+            apo = tmstruckWeightResultMapper.queryApoByOrderNo(orderNo);
+        }
+        if (apoInwardOrderType.contains(orderType)) {
+            apo = tmstruckWeightResultMapper.queryApoInwardByOrderNo(orderNo);
+        }
+        return apo;
+
+    }
 }

+ 22 - 0
src/main/resources/com/steerinfo/dil/mapper/TmstruckWeightResultMapper.xml

@@ -1351,4 +1351,26 @@
         TWR.SALE_MATERIAL_ID = #{saleMaterialId}
 
     </select>
+    <select id="queryApoByOrderNo" resultType="java.lang.String">
+        SELECT APO.PURCHASE_ORDER_NO from OMSTRUCK_ORDER OO
+        LEFT JOIN AMS_PURCHASE_ORDER APO
+        ON APO.PURCHASE_ORDER_ID = OO.ORDER_PLAN_ID
+        WHERE OO.ORDER_NUMBER = #{orderNo}
+    </select>
+    <select id="queryOrderType" resultType="java.lang.Integer" parameterType="string">
+        SELECT OO.ORDER_TYPE FROM OMSTRUCK_ORDER OO
+        WHERE OO.ORDER_NUMBER = #{orderNo}
+    </select>
+    <select id="queryApoInwardByOrderNo" resultType="java.lang.String" parameterType="string">
+        SELECT APO.PURCHASE_ORDER_NO FROM OMSTRUCK_ORDER OO
+        LEFT JOIN AMSTRUCK_INWARD_PLAN AIP
+        ON AIP.PLAN_ID = OO.ORDER_PLAN_ID
+        LEFT JOIN AMSTRUCK_REQUIREMENT_PLAN ARP
+        ON ARP.PLAN_ID = AIP.PLAN_ID
+        LEFT JOIN AMSTRUCK_INWARD_REQUIREMENT AIR
+        ON AIR.REQUIREMENT_ID = ARP.REQUIREMENT_ID
+        LEFT JOIN AMS_PURCHASE_ORDER APO
+        ON APO.PURCHASE_ORDER_ID = AIR.PURCHASE_ORDER_ID
+        WHERE OO.ORDER_NUMBER = #{orderNo}
+    </select>
 </mapper>