修改

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

@@ -22,13 +22,12 @@ import java.io.IOException;
 @RequestMapping("/${api.version}/tmsTruckQualityResult")
 public class TmsTruckQualityResultController extends BaseRESTfulController {
 
-//    @Autowired
-//    TmsTruckQualityService tmsTruckQualityService;
-//    @ApiModelProperty(value = "发送磅单号,接收质检实绩信息")
-//    @GetMapping("/insert")
-//    @Transactional
-//    public RESTfulResult addQualityResult() throws IOException, DocumentException {
-//
-//        return success(tmsTruckQualityService.insertQualityResult());
-//    }
+    //@Autowired
+    //TmsTruckQualityService tmsTruckQualityService;
+    //@ApiModelProperty(value = "发送磅单号,接收质检实绩信息")
+    //@GetMapping("/insert")
+    ////@Transactional
+    //public RESTfulResult addQualityResult() throws IOException, DocumentException {
+    //    return success(tmsTruckQualityService.insertQualityResult());
+    //}
 }

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

@@ -39,7 +39,7 @@ public class TmsTruckQualityService implements ITmsTruckQualityResultService {
     @Scheduled(cron = "30 10 10 * * ?")
     public int insertQualityResult() throws IOException, DocumentException {
         //先查出所有需要质检的但是没有质检的磅单号
-        List<Map<String,Object>>mapList=tmstruckWeightResultMapper.selectWzInputId();
+        List<Map<String,Object>> mapList = tmstruckWeightResultMapper.selectWzInputId();
         if (mapList.size() != 0){
             for (Map<String,Object> map:mapList
             ) {
@@ -65,18 +65,15 @@ public class TmsTruckQualityService implements ITmsTruckQualityResultService {
                     //System.out.println(result);
                     try {
                         JSONObject object = XmlToJsonUtil.xmlToJson(result);
-                        //System.out.println("-----object------");
-                        //System.out.println(object);
                         Map<String, Object>map1 = (Map<String, Object>) object.get("JsonResult");
-                        //System.out.println(map1);
                         List mapList2= JSON.parseArray((String) map1.get("jsonResult"));
-                        if(mapList2.size() == 0){
+                        if(mapList2 == null || mapList2.size() == 0){
                             continue;
                         }
-                        List<Map<String,Object>>mapList9=mapList2;
-                        for (Map<String,Object> map3:mapList9
-                        ) {
+                        List<Map<String,Object>> mapList9= mapList2;
+                        if(mapList9.get(0) != null){
                             //判断是否生成报告单，如果生成则生成质检实绩，否则退出
+                            Map<String,Object> map3 = mapList9.get(0);
                             Object value =  map3.get("REPORT_ID");
                             if("".equals(value)){
                                 continue;
@@ -114,7 +111,7 @@ public class TmsTruckQualityService implements ITmsTruckQualityResultService {
                             tmstruckQualityResult.setElementValue(element_value);
                             tmstruckQualityResultMapper.insertSelective(tmstruckQualityResult);
                             //更新计重实绩表中的是否质检完成字段
-                            tmstruckWeightResultMapper.updateWzInputId(resultTotalId);
+                            //tmstruckWeightResultMapper.updateWzInputId(resultTotalId);
                         }
                     } catch (DocumentException e) {
                         e.printStackTrace();

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

@@ -698,39 +698,53 @@
         and TWR.MATERIAL_ID=#{materialId,jdbcType=DECIMAL}
     </select>
     <select id="selectWzInputId" resultType="java.util.Map">
-        (SELECT DISTINCT
-             twr.RESULT_TOTAL_ID "resultTotalId",
-             RC.CAPACITY_NUMBER  "capacityNumber",
-             to_char(TWR.RESULT_GROSS_WEIGHT_TIME,'YYYYMMDDHH24MISS')  "grossWeightTime"
-         from TMSTRUCK_WEIGHT_RESULT TWR
-                  LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
-                            ON TTR.RESULT_TOTAL_ID = TWR.RESULT_TOTAL_ID
-                  LEFT JOIN OMSTRUCK_ORDER OO
-                            ON OO.ORDER_ID = TTR.ORDER_ID
-                  LEFT JOIN RMS_CAPACITY RC
-                            ON RC.CAPACITY_ID = OO.CAPACITY_ID
-                  LEFT JOIN TMSTRUCK_ENFACTORY_RESULT TER
-                            ON TER.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
-         WHERE OO.ORDER_TYPE IN (10,20)
-           AND TWR.GROSS_SEGMENT_SQE = 7
-           AND TER.SEGMEN_SQE = 6
-           AND TWR.ISQUALITY IS NULL)
-        union
-        (SELECT DISTINCT
-             twr.RESULT_TOTAL_ID "resultTotalId",
-             RC.CAPACITY_NUMBER  "capacityNumber",
-             to_char(TWR.RESULT_GROSS_WEIGHT_TIME,'YYYYMMDDHH24MISS')  "grossWeightTime"
-         from TMSTRUCK_WEIGHT_RESULT TWR
-                  LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
-                            ON TTR.RESULT_TOTAL_ID = TWR.RESULT_TOTAL_ID
-                  LEFT JOIN OMSTRUCK_ORDER OO
-                            ON OO.ORDER_ID = TTR.ORDER_ID
-                  LEFT JOIN RMS_CAPACITY RC
-                            ON RC.CAPACITY_ID = OO.CAPACITY_ID
-                  LEFT JOIN TMSTRUCK_ENFACTORY_RESULT TER
-                            ON TER.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
-         WHERE OO.ORDER_TYPE IN (6,7,18)
-           AND TWR.ISQUALITY IS NULL)
+        --采购内转
+        SELECT
+            *
+        FROM
+            (
+                (
+                    SELECT DISTINCT
+                        twr.RESULT_TOTAL_ID "resultTotalId",
+                        RC.CAPACITY_NUMBER "capacityNumber",
+                        to_char( TWR.RESULT_GROSS_WEIGHT_TIME, 'YYYYMMDDHH24MISS' ) "grossWeightTime",
+                        oo.order_id "orderId"
+                    FROM
+                        TMSTRUCK_WEIGHT_RESULT TWR
+                            LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR ON TTR.RESULT_TOTAL_ID = TWR.RESULT_TOTAL_ID
+                            LEFT JOIN OMSTRUCK_ORDER OO ON OO.ORDER_ID = TTR.ORDER_ID
+                            LEFT JOIN RMS_CAPACITY RC ON RC.CAPACITY_ID = OO.CAPACITY_ID
+                            LEFT JOIN TMSTRUCK_ENFACTORY_RESULT TER ON TER.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+                            LEFT JOIN TMSTRUCK_QUALITY_RESULT TQR ON TQR.TOTAL_RESULT_ID = TTR.RESULT_TOTAL_ID
+                    WHERE
+                        TWR.GROSS_SEGMENT_SQE = 7
+                      AND TWR.tare_SEGMENT_SQE = 9
+                      AND TER.SEGMEN_SQE = 6
+                      AND twr.RESULT_NET_WEIGHT IS NOT NULL
+                      AND TQR.RESULT_ID IS NULL
+                      AND OO.ORDER_STATUS = 2
+                      AND OO.ORDER_TYPE IN ( 10, 20 )
+                ) UNION ALL--普通采购
+                SELECT DISTINCT
+                    twr.RESULT_TOTAL_ID "resultTotalId",
+                    RC.CAPACITY_NUMBER "capacityNumber",
+                    to_char( TWR.RESULT_GROSS_WEIGHT_TIME, 'YYYYMMDDHH24MISS' ) "grossWeightTime",
+                    oo.order_id "orderId"
+                FROM
+                    TMSTRUCK_WEIGHT_RESULT TWR
+                        LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR ON TTR.RESULT_TOTAL_ID = TWR.RESULT_TOTAL_ID
+                        LEFT JOIN OMSTRUCK_ORDER OO ON OO.ORDER_ID = TTR.ORDER_ID
+                        LEFT JOIN RMS_CAPACITY RC ON RC.CAPACITY_ID = OO.CAPACITY_ID
+                        LEFT JOIN TMSTRUCK_ENFACTORY_RESULT TER ON TER.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+                        LEFT JOIN TMSTRUCK_QUALITY_RESULT TQR ON TQR.TOTAL_RESULT_ID = TTR.RESULT_TOTAL_ID
+                WHERE
+                    twr.RESULT_NET_WEIGHT IS NOT NULL
+                  AND TQR.RESULT_ID IS NULL
+                  AND OO.ORDER_STATUS = 2
+                  AND OO.ORDER_TYPE IN ( 5, 6, 7, 17, 18,15, 16, 23, 24 )
+            )
+        ORDER BY
+            "orderId" DESC
     </select>
     <update id="updateWzInputId" parameterType="decimal">
         update TMSTRUCK_WEIGHT_RESULT twr