问题修改

src/main/java/com/tld/controller/AskGoodsController.java

@@ -140,8 +140,8 @@ public class AskGoodsController {
      * @return 返回结果
      */
     @GetMapping("getGoodsHalf")
-    public Map<String, Object> getGoodsHalf(AskGoods askGoods){
-        return askGoodsService.getGoodsHalf(askGoods);
+    public Map<String, Object> getGoodsHalf(AskGoods askGoods, HttpServletRequest request){
+        return askGoodsService.getGoodsHalf(askGoods, request);
     }
 
     /**

src/main/java/com/tld/model/AskGoods.java

@@ -284,4 +284,8 @@ public class AskGoods implements Serializable {
      * 子表备注
      */
     private String remarkZ;
+    /**
+     *
+     */
+    private String isWeb;
 }

src/main/java/com/tld/service/AskGoodsService.java

@@ -33,7 +33,7 @@ public interface AskGoodsService {
 
     Map<String, Object> delAskGoodsVitrual(String id, String type);
 
-    Map<String, Object> getGoodsHalf(AskGoods askGoods);
+    Map<String, Object> getGoodsHalf(AskGoods askGoods, HttpServletRequest request);
 
     Map<String, Object> getRemovalHalfProduct(AskGoods askGoods);
 

src/main/java/com/tld/service/impl/AskGoodsServiceImpl.java

@@ -362,7 +362,7 @@ public class AskGoodsServiceImpl implements AskGoodsService {
                 if(mapList.size() >0 ) {
                     JSONObject strJson = new JSONObject();
                     int isRed = 0;
-                    if(mapList.get(0).get("requestTypeName").toString().equals("跨越退料")){
+                    if(mapList.get(0).get("requestTypeName").toString().equals("跨月退料")){
                         isRed = 2;
                     } else {
                         isRed = 0;
@@ -558,11 +558,12 @@ public class AskGoodsServiceImpl implements AskGoodsService {
     }
 
     @Override
-    public Map<String, Object> getGoodsHalf(AskGoods askGoods) {
+    public Map<String, Object> getGoodsHalf(AskGoods askGoods, HttpServletRequest request) {
         Map<String, Object> map = new HashMap<>();
         try{
             //查询数据
             PageHelper.startPage(askGoods.getPage(), askGoods.getLimit());
+            askGoods.setIsWeb(request.getHeader("isWeb"));
             PageInfo<AskGoods> list = new PageInfo<>(askGoodsMapper.getGoodsHalf(askGoods));
             for (AskGoods goods : list.getList()) {
                 String amount = askGoodsMapper.getAmount(goods);

src/main/resources/mapper/AskGoodsMapper.xml

@@ -738,11 +738,13 @@
             left join tld_company g on c.company_number = g.code
             left join tld_wbs f on a.wbs = f.tld_id
         WHERE
-        ((a.num + 0) <![CDATA[>]]> (IFNULL(a.out_num, 0) + 0) or ((a.num like '-%') and ((a.num + 0) != (a.out_num + 0))))
-        and b.part_type = #{partType}
+        b.part_type = #{partType}
         <if test="userId != null and userId != ''">
             and b.code in (select material_id from tld_user_material where user_id = #{userId})
         </if>
+        <if test="isWeb == '0'.toString()">
+            and ((a.num + 0) <![CDATA[>]]> (IFNULL(a.out_num, 0) + 0) or ((a.num like '-%') and ((a.num + 0) != (a.out_num + 0))))
+        </if>
         <if test="productionCode != null and productionCode != ''">
             and a.production_code like CONCAT(CONCAT('%', #{productionCode}), '%')
         </if>
@@ -1714,7 +1716,7 @@
     <select id="getCallWorkOrder" resultType="java.util.Map">
         select
             storage_code as storageCode,
-            user_name as userName
+            ifnull(user_name, '300168') as userName
         from tld_return_gs_warehousing where source_type  <![CDATA[=]]> 'W'
     </select>
     <!-- 修改数据传输状态 -->

src/main/resources/mapper/QueryListMappeer.xml

@@ -234,6 +234,7 @@
                 and c.unit_of_measurement = #{unitOfMeasurement}
             </if>
         </trim>
+        order by c.code
     </select>
     <!--导出-->
     <select id="getStorageLocation" resultType="java.util.LinkedHashMap">