修改位置生成任务数量

ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java

@@ -291,8 +291,8 @@ public class PdaServiceImp implements PdaService {
      * @param mydoJob
      * @return
      */
-
-    private AjaxResult handleOutType2(TrayCodeMakeSure trayCodeMakeSure, List<MydoJobDetail> mydoJobDetailList, MydoJob mydoJob) {
+    @Transactional(rollbackFor = Exception.class)
+    public AjaxResult handleOutType2(TrayCodeMakeSure trayCodeMakeSure, List<MydoJobDetail> mydoJobDetailList, MydoJob mydoJob) {
         BasWarehouse basWarehouse = basWarehouseService.selectBasWarehouseByWarehouseId(mydoJob.getWarehouseId());
         //修改拣选数量
         for (MydoJobDetail mydoJobDetail : mydoJobDetailList) {
@@ -348,7 +348,8 @@ public class PdaServiceImp implements PdaService {
      * @param mydoJob
      * @return
      */
-    private AjaxResult handleOutType1(TrayCodeMakeSure trayCodeMakeSure, List<MydoJobDetail> mydoJobDetailList, MydoJob mydoJob) {
+    @Transactional(rollbackFor = Exception.class)
+    public AjaxResult handleOutType1(TrayCodeMakeSure trayCodeMakeSure, List<MydoJobDetail> mydoJobDetailList, MydoJob mydoJob) {
 
         BasWarehouse basWarehouse = basWarehouseService.selectBasWarehouseByWarehouseId(mydoJob.getWarehouseId());
 
@@ -482,6 +483,7 @@ public class PdaServiceImp implements PdaService {
 
             HashMap<String, Object> map = new HashMap<>();
             map.put("v_tray_code", trayCodeMakeSure.getTrayCode());
+            map.put("v_entrance_id", getEntranceIdByExitId(mydoJob.getExitId()));
 
             //执行【盘点确认出库】过程
             pdaMapper.checkMakeSure(map);

ruoyi-admin/src/main/resources/application-druid.yml

@@ -6,7 +6,7 @@ spring:
         druid:
             #主数据信息
             master:
-                url: jdbc:sqlserver://172.16.2.170:1433;databaseName=FT501;
+                url: jdbc:sqlserver://172.16.4.12:1433;databaseName=FT501;
                 username: sa
                 password: Flrd0914.
             # 从库数据源

ruoyi-admin/src/main/resources/application.yml

@@ -68,7 +68,7 @@ spring:
   # redis 配置
   redis:
     # 地址
-    host: 172.16.2.170
+    host: 127.0.0.1
     # 端口，默认为6379
     port: 6379
     # 数据库索引

ruoyi-admin/src/main/resources/mapper/pda/PdaMapper.xml

@@ -73,6 +73,7 @@
     <select id="checkMakeSure" parameterType="java.util.Map" statementType="CALLABLE">
         {call proc_check_makesure(
                 #{v_tray_code,mode=IN,jdbcType=VARCHAR},
+                #{v_entrance_id,mode=IN,jdbcType=VARCHAR},
                 #{v_result,mode=OUT,jdbcType=INTEGER},
                 #{v_resultmsg,mode=OUT,jdbcType=VARCHAR}
               )}