盘点测试修改

ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWcsServiceImpl.java

@@ -47,6 +47,7 @@ public class ToWcsServiceImpl implements IToWcsService {
         mydoJobParam.setStatus("1");
         List<String> list = new ArrayList<>();
         list.add("21");
+        list.add("26");
         mydoJobParam.setInOutIds(list);
         List<MydoJob> outMydoJobs = mydoJobService.selectMydoJobListApi(mydoJobParam);
         for (MydoJob outMydoJob : outMydoJobs) {

ruoyi-admin/src/main/java/com/ruoyi/check/difference/service/impl/CheckDifferenceRecordServiceImpl.java

@@ -61,7 +61,7 @@ public class CheckDifferenceRecordServiceImpl implements ICheckDifferenceRecordS
      * @return 盘点差异
      */
     @Override
-    @DataScope(warehouseAlias = "w")
+    //@DataScope(warehouseAlias = "w")
     public List<CheckDifferenceRecord> selectCheckDifferenceRecordList(CheckDifferenceRecord checkDifferenceRecord)
     {
         return checkDifferenceRecordMapper.selectCheckDifferenceRecordList(checkDifferenceRecord);

ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetail/mapper/MydoJobDetailMapper.java

@@ -68,4 +68,6 @@ public interface MydoJobDetailMapper
     List<MydoJobDetail> selectMydoJobDetailListByJobId(String jobId);
 
     List<MydoJobDetail> selectMydoJobDetailListByExit(MydoJob mydoJob);
+
+    List<MydoJobDetail> selectPdMydoJobDetailListByExit(MydoJob mydoJob);
 }

ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetail/service/IMydoJobDetailService.java

@@ -69,4 +69,6 @@ public interface IMydoJobDetailService
     List<MydoJobDetail> selectMydoJobDetailListByJobId(String jobId);
 
     List<MydoJobDetail> selectMydoJobDetailListByExit(MydoJob mydoJob);
+
+    List<MydoJobDetail> selectPdMydoJobDetailListByExit(MydoJob mydoJob);
 }

ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetail/service/impl/MydoJobDetailServiceImpl.java

@@ -119,4 +119,9 @@ public class MydoJobDetailServiceImpl implements IMydoJobDetailService
     public List<MydoJobDetail> selectMydoJobDetailListByExit(MydoJob mydoJob) {
         return mydoJobDetailMapper.selectMydoJobDetailListByExit(mydoJob);
     }
+
+    @Override
+    public List<MydoJobDetail> selectPdMydoJobDetailListByExit(MydoJob mydoJob) {
+        return mydoJobDetailMapper.selectPdMydoJobDetailListByExit(mydoJob);
+    }
 }

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

@@ -108,6 +108,15 @@ public class PdaServiceImp implements PdaService {
     //@Transactional(rollbackFor = Exception.class)
     public AjaxResult checkMakeSure(TrayCodeMakeSure trayCodeMakeSure) {
 
+        MydoJob mydoJob = new MydoJob();
+        mydoJob.setExitId(trayCodeMakeSure.getExitId());
+        mydoJob.setStatus("3");
+        mydoJob.setInOrOut("26");
+        List<MydoJobDetail> mydoJobDetails = mydoJobDetailService.selectPdMydoJobDetailListByExit(mydoJob);
+        if(mydoJobDetails.isEmpty()){
+            return AjaxResult.error("该物料没有盘点出库作业，请检查");
+        }
+
         List<MydoJobDetail> mydoJobDetailList = trayCodeMakeSure.getMaterials();
         if (CollUtil.isNotEmpty(mydoJobDetailList)) {
             boolean flag = mydoJobDetailList.stream().anyMatch(x -> StrUtil.isEmpty(x.getStockId()) && "0".equals(x.getInQuantity()));
@@ -118,7 +127,7 @@ public class PdaServiceImp implements PdaService {
                 //插入盘点提交表
                 CheckCommitRecord checkCommitRecord = new CheckCommitRecord();
                 checkCommitRecord.setQuantity(mydoJobDetail.getInQuantity());
-                checkCommitRecord.setTrayCode(trayCodeMakeSure.getTrayCode());
+                checkCommitRecord.setTrayCode(mydoJobDetails.get(0).getTrayCode());
                 checkCommitRecord.setStockId(mydoJobDetail.getStockId());
                 checkCommitRecord.setSpare1(mydoJobDetail.getInOrOutDId());
                 checkCommitRecord.setSpare2(mydoJobDetail.getProductId());
@@ -128,7 +137,7 @@ public class PdaServiceImp implements PdaService {
             }
         }
         HashMap<String, Object> map = new HashMap<>();
-        map.put("v_tray_code", trayCodeMakeSure.getTrayCode());
+        map.put("v_tray_code", mydoJobDetails.get(0).getTrayCode());
         pdaMapper.checkMakeSure(map);
         //iToWcsService.pushInMydoJob();
         String result = map.get("v_result").toString();

ruoyi-admin/src/main/resources/mapper/job/MydoJobDetailMapper.xml

@@ -375,4 +375,51 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         and mj.in_or_out>=20
 
     </select>
+    <select id="selectPdMydoJobDetailListByExit" parameterType="MydoJob" resultMap="MydoJobDetailResult">
+        select mjd.job_detail_id,
+               mjd.job_id,
+               mjd.stock_id,
+               mjd.lot_no,
+               mjd.in_date,
+               mjd.in_or_out_id,
+               mjd.in_or_out_d_id,
+               mjd.product_guid,
+               mjd.product_id,
+               mjd.stock_status,
+               mjd.in_quantity,
+               mjd.stock_quantity,
+               mjd.out_quantity,
+               mjd.layer_quantity,
+               mjd.out_layer_quantity,
+               mjd.give_num,
+               mjd.stockin_id,
+               mjd.stacking_id,
+               mjd.exit_id,
+               mjd.print_date,
+               mjd.customer_id,
+               mjd.supplier_id,
+               mjd.spare1,
+               mjd.spare2,
+               mjd.spare3,
+               mjd.spare4,
+               mjd.pick_quantity,
+               mjd.out_quantity-mjd.pick_quantity as pick_quantity_real,
+               bp.product_name,
+               mjd.spare5,
+               mjd.spare6,
+               mjd.spare7,
+               mjd.spare8,
+               mjd.spare9,
+               mjd.spec,
+               mjd.unit,
+               mj.tray_code
+
+        from mydo_job_detail mjd
+                 left join bas_product bp on mjd.product_id = bp.product_id
+                 left join mydo_job mj on mjd.job_id = mj.job_id
+        where mj.exit_id=#{exitId}
+          and mj.status='3'
+          and mj.execution_phase=2
+          and mj.in_or_out = #{inOrOut}
+    </select>
 </mapper>