问题修改

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

@@ -156,6 +156,16 @@ public class AskGoodsController {
         return askGoodsService.getRemovalHalf(askGoods);
     }
 
+    /**
+     * 产成品出库流水修改连翻号
+     * @param askGoods 参数
+     * @return 返回结果
+     */
+    @PutMapping("getRemovalHalfUpdSerial")
+    public Map<String, Object> getRemovalHalfUpdSerial( @RequestBody AskGoods askGoods){
+        return askGoodsService.getRemovalHalfUpdSerial(askGoods);
+    }
+
     /**
      * 产成品出库流水导出
      * @param askGoods 参数

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

@@ -319,5 +319,17 @@ public class QueryListController {
         return queryListService.getFinishedGoods(receiveGoods);
     }
 
+    /**
+    * @Description: 查询pda所有任务
+    * @Param:
+    * @return:
+    * @Author: XiaoChen
+    * @Date: 2023/5/6
+    */
+    @GetMapping("getPdaTask")
+    public Map<String, Object> getPdaTask(User user){
+        return queryListService.getPdaTask(user);
+    }
+
 }
 

src/main/java/com/tld/mapper/AskGoodsMapper.java

@@ -175,4 +175,6 @@ public interface AskGoodsMapper {
     List<Map<String, Object>> getGsRemovals(@Param("removalCode") String removalCode);
 
     List<String> getWarehouseWheres(@Param("removalCode") String removalCode);
+
+    void UpdSerial(AskGoods askGoods);
 }

src/main/java/com/tld/mapper/QueryListMapper.java

@@ -85,4 +85,6 @@ public interface QueryListMapper {
     Integer getNoticeSum(@Param("format") String format, @Param("nameType") String nameType);
 
     Integer getDeliverySum(@Param("format") String format, @Param("nameType") String nameType);
+
+    List<Map<String, Object>> getPdaTask(User user);
 }

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

@@ -139,4 +139,8 @@ public class Delivery implements Serializable {
      * wbs编号
      */
     private String wbsCode;
+    /**
+     * 连翻号
+     */
+    private String serial;
 }

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

@@ -24,6 +24,10 @@ public class User implements Serializable {
      * 用户名称
      */
     private String userName;
+    /**
+     * 用户id
+     */
+    private String userId;
     /**
      * 密码
      */

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

@@ -57,4 +57,6 @@ public interface AskGoodsService {
     void CreateOtherDeliveryMaterials(String removalCode, String realName);
 
     void CreateOtherDeliveryMaterial(String removalCode, String realName);
+
+    Map<String, Object> getRemovalHalfUpdSerial(AskGoods askGoods);
 }

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

@@ -67,4 +67,6 @@ public interface QueryListService {
     Map<String, Object> getRawMaterial(ReceiveGoods receiveGoods);
 
     Map<String, Object> getFinishedGoods(ReceiveGoods receiveGoods);
+
+    Map<String, Object> getPdaTask(User user);
 }

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

@@ -1516,6 +1516,25 @@ public class AskGoodsServiceImpl implements AskGoodsService {
         }
     }
 
+    /**
+     * 产成品出库流水修改连翻号
+     * @param askGoods 参数
+     * @return 返回结果
+     */
+    @Override
+    public Map<String, Object> getRemovalHalfUpdSerial(AskGoods askGoods) {
+        Map<String, Object> map = new HashMap<>();
+        try{
+           askGoodsMapper.UpdSerial(askGoods);
+            map.put("msg", "200");
+        }catch (Exception e){
+            e.printStackTrace();
+            map.put("msg", "500");
+            map.put("errMsg", "失败");
+        }
+        return map;
+    }
+
     /**
      * 出库单生成
      * @return

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

@@ -876,4 +876,26 @@ public class QueryListServiceImpl implements QueryListService {
         }
         return map;
     }
+
+    /**
+     * @Description: 查询pda所有任务
+     * @Param:
+     * @return:
+     * @Author: XiaoChen
+     * @Date: 2023/5/6
+     */
+    @Override
+    public Map<String, Object> getPdaTask(User user) {
+        Map<String, Object> map = new HashMap<>();
+        try{
+            List<Map<String,Object>> list = queryListMapper.getPdaTask(user);
+            map.put("data", list);
+            map.put("msg", "200");
+        } catch (Exception e){
+            e.printStackTrace();
+            map.put("msg", "500");
+            map.put("errMsg", "服务器请求异常，请稍后再试");
+        }
+        return map;
+    }
 }

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

@@ -1117,6 +1117,7 @@ public class WarehousingServiceImpl implements WarehousingService {
                             .setCompanyNumber(list.get(0).getCompanyNumber()) //公司编号
                             .setCustomerCode(list.get(0).getCustomerCode())//客户编号
                             .setStorageCode(removalCodes) //出库流水
+                            .setSerial(askGoodsGs.getSerial())//连翻号
                             .setWbs(list.get(0).getWbs());// wbs
                     deliveryMapper.addRemovalHalf(delivery1); //流水录入
                 }

src/main/resources/mapper/AskGoodsMapper.xml

@@ -823,6 +823,7 @@
             e.name as customerName,
             f.name as companyName,
             b.code as materialCode,
+            a.serial,
             a.storage_code,
             a.wbs,
             c.real_name as realName,
@@ -1380,4 +1381,8 @@
     <update id="updateEnquiryOutNum">
         update tld_enquiry set out_num = (out_num + 0) + #{num} where ask_goods_id = #{askGoodsId} and entry_number = #{entryNumber}
     </update>
+    <!--产成品出库流水修改连翻号-->
+    <update id="UpdSerial">
+        update tld_removal_half set serial = #{serial} where id = #{id}
+    </update>
 </mapper>

src/main/resources/mapper/DeliveryMapper.xml

@@ -154,8 +154,8 @@
     </update>
     <!-- 产成品出库流水 -->
     <insert id="addRemovalHalf">
-        insert into tld_removal_half(wllb_code,num,user_id,scrq,delivery_id,company_number,customer_code,storage_code,wbs,transmission_type)
-        value(#{materialCode},#{outNum},#{userId},now(),#{deliveryId},#{companyNumber},#{customerCode},#{storageCode},#{wbs},0)
+        insert into tld_removal_half(wllb_code,num,user_id,scrq,delivery_id,company_number,customer_code,storage_code,wbs,transmission_type,serial)
+        value(#{materialCode},#{outNum},#{userId},now(),#{deliveryId},#{companyNumber},#{customerCode},#{storageCode},#{wbs},0,#{serial})
     </insert>
     <!-- 查询销售单父级信息 -->
     <select id="getDeliveryF" resultType="com.tld.model.Delivery">

src/main/resources/mapper/QueryListMappeer.xml

@@ -1226,4 +1226,29 @@
         where  c.part_type =  #{nameType}
         and DATE_FORMAT( b.bills_time, '%Y-%m-%d' ) = #{format}
     </select>
+    <!--查询pda所有任务-->
+    <select id="getPdaTask" resultType="java.util.Map">
+        SELECT
+            a.id,
+            a.scrq,
+            a.modify_time AS modifyTime,
+            b.code,
+            b.name,
+            b.part_type AS partType,
+            c.user_name AS userName,
+            c.real_name AS realName,
+            d.user_name AS modifyUserName,
+            d.real_name AS modifyRealName,
+            d.modify_time AS modifyTime
+        FROM tld_user_material a
+        LEFT JOIN tld_material b ON a.material_id = b.CODE
+        LEFT JOIN tld_user c ON a.user_id = c.id
+        LEFT JOIN tld_user d ON a.modify_user = d.id
+        <trim prefix="WHERE" prefixOverrides="and |or">
+            <if test="userId != null and userId != ''">
+                and a.user_id = #{userId}
+            </if>
+        </trim>
+        ORDER BY a.id DESC
+    </select>
 </mapper>