出库单据

ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java

@@ -31,6 +31,7 @@ import com.ruoyi.out.exception.service.IOutExceptionRecordService;
 import com.ruoyi.out.outStockoutDetail.domain.OutStockoutDetail;
 import com.ruoyi.out.outStockoutDetail.service.IOutStockoutDetailService;
 import com.ruoyi.pda.domain.TrayCodeMakeSure;
+import com.ruoyi.pda.mapper.PdaMapper;
 import com.ruoyi.pda.service.PdaService;
 import com.ruoyi.stock.stock.domain.BasStock;
 import com.ruoyi.stock.stock.mapper.BasStockMapper;
@@ -80,6 +81,8 @@ public class MydoJobServiceImpl implements IMydoJobService {
     private ITransferBillCallbackService transferBillCallbackService;
     @Autowired
     private BasStockMapper basStockMapper;
+    @Autowired
+    private PdaMapper pdaMapper;
 
 
     /**
@@ -335,17 +338,19 @@ public class MydoJobServiceImpl implements IMydoJobService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public AjaxResult OuthandFinish(String[] jobIds) {
+        StringBuilder stringBuilder = new StringBuilder();
         for (String jobId : jobIds) {
             MydoJob job = selectMydoJobByJobId(jobId);
-            BasWarehouse basWarehouse = basWarehouseService.selectBasWarehouseByWarehouseId(job.getWarehouseId());
+            HashMap<String, Object> map = new HashMap<>();
-
+            map.put("v_tray_code", job.getTrayCode());
-            if ("2".equals(basWarehouse.getWarehouseType()) && Integer.parseInt(job.getStatus()) < 3) {
+            pdaMapper.outMakeSure(map);
-                log.error("只能完成正执行的作业");
+            String result=map.get("v_result").toString();
-                return AjaxResult.error(MessageUtils.message("error.message14"));
+            if(!"10".equals(result)){
+                stringBuilder.append(",").append(map.get("v_resultmsg"));
             }
-            TrayCodeMakeSure trayCodeMakeSure = new TrayCodeMakeSure();
+        }
-            trayCodeMakeSure.setTrayCode(job.getTrayCode());
+        if (!StrUtil.isEmpty(stringBuilder.toString())){
-            pdaService.outMakeSure(trayCodeMakeSure);
+            return AjaxResult.warn(stringBuilder.toString());
         }
         return AjaxResult.success();
     }

ruoyi-ui/src/views/out/outStockoutManage.vue

@@ -32,7 +32,7 @@
       </el-form-item>
       <el-form-item :label="'客户名称'" prop="customerName">
         <el-input
-          v-model="queryParams.inputCustomerName"
+          v-model="queryParams.customerName"
           :placeholder="'请输入客户名称'"
           clearable
           @keyup.enter.native="handleQuery"