物料

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

@@ -513,13 +513,10 @@ public class MydoJobServiceImpl implements IMydoJobService {
             if (!"10".equals(result)) {
                 Stringbuilder += stockId + msg + "<br/>";
             }
-
         }
-
         if (!StrUtil.isEmpty(Stringbuilder)) {
             return AjaxResult.warn(Stringbuilder);
         }
-
         return AjaxResult.success();
     }
 

ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetail/domain/MydoJobDetail.java

@@ -152,6 +152,7 @@ public class MydoJobDetail extends BaseEntity
     private String unit;
     private String trayCode;
     private String cargoNo;
+    private String warehouseId;
 
 
 

ruoyi-admin/src/main/java/com/ruoyi/pda/controller/PdaController.java

@@ -131,6 +131,12 @@ public class PdaController extends BaseController {
         return pdaService.rkSure(trayCodeMsg);
     }
 
+    @RequestMapping("/rkSurepk")
+    @ResponseBody
+    public AjaxResult rkSurepk(@RequestBody TrayCodeMsg trayCodeMsg) {
+        return pdaService.rkSurepk(trayCodeMsg);
+    }
+
     @RequestMapping("/ktpout")
     @ResponseBody
     public AjaxResult ktpout(@RequestBody TrayCodeMsg trayCodeMsg) {

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

@@ -32,6 +32,8 @@ public interface PdaService {
 
     AjaxResult rkSure(TrayCodeMsg trayCodeMsg);
 
+    AjaxResult rkSurepk(TrayCodeMsg trayCodeMsg);
+
     AjaxResult ktpout(TrayCodeMsg trayCodeMsg);
 
     AjaxResult ktpin(TrayCodeMsg trayCodeMsg);

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

@@ -4,6 +4,8 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import com.ruoyi.api.domain.RequestEnter;
 import com.ruoyi.api.service.IToWmsService;
+import com.ruoyi.bas.warehouse.domain.BasWarehouse;
+import com.ruoyi.bas.warehouse.mapper.BasWarehouseMapper;
 import com.ruoyi.check.commit.domain.CheckCommitRecord;
 import com.ruoyi.check.commit.service.ICheckCommitRecordService;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -21,6 +23,8 @@ import com.ruoyi.pda.domain.TrayCodeMsg;
 import com.ruoyi.pda.mapper.PdaMapper;
 import com.ruoyi.pda.trayMsg.domain.TrayMsg;
 import com.ruoyi.pda.trayMsg.service.ITrayMsgService;
+import com.ruoyi.stock.stock.domain.BasStock;
+import com.ruoyi.stock.stock.mapper.BasStockMapper;
 import com.ruoyi.system.service.ISysRoleService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -48,6 +52,10 @@ public class PdaServiceImp implements PdaService {
     private IToWmsService iToWmsService;
     @Autowired
     private IMydoJobDetailService mydoJobDetailService;
+    @Autowired
+    private BasWarehouseMapper basWarehouseMapper;
+    @Autowired
+    private BasStockMapper basStockMapper;
 
 
     @Override
@@ -88,12 +96,18 @@ public class PdaServiceImp implements PdaService {
     @Override
     public AjaxResult outMakeSure(TrayCodeMakeSure trayCodeMakeSure) {
         MydoJob mydoJobParam = new MydoJob();
-        //mydoJobParam.setExitId(trayCodeMakeSure.getExitId());
         mydoJobParam.setTrayCode(trayCodeMakeSure.getTrayCode());
         mydoJobParam.setStatus("3");
-//        mydoJobParam.setInOrOut("21");
         List<MydoJobDetail> mydoJobDetails = mydoJobDetailService.selectMydoJobDetailListByExit(mydoJobParam);
-        if(mydoJobDetails.isEmpty()){
+        BasWarehouse basWarehouse = basWarehouseMapper.selectBasWarehouseByWarehouseId(mydoJobDetails.get(0).getWarehouseId());
+        if("2".equals(basWarehouse.getWarehouseType()) && mydoJobDetails.isEmpty()){
+            BasStock basStock = new BasStock();
+            basStock.setTrayCode(trayCodeMakeSure.getTrayCode());
+            List<BasStock> basStocks = basStockMapper.selectBasStockList(basStock);
+            basStockMapper.deleteBasStockByStockIds((String[]) basStocks.stream().map(BasStock::getStockId).toArray());
+
+        }
+        if(mydoJobDetails.isEmpty() && "1".equals(basWarehouse.getWarehouseType())){
             return AjaxResult.error("该物料没有出库作业，请检查");
         }
         HashMap<String, Object> map = new HashMap<>();
@@ -192,6 +206,7 @@ public class PdaServiceImp implements PdaService {
     public AjaxResult rkSure(TrayCodeMsg trayCodeMsg) {
         HashMap<String, Object> map = new HashMap<>();
         map.put("v_tray_code", trayCodeMsg.getTrayCode());
+        map.put("v_warehouse_id", trayCodeMsg.getWarehouseId());
         pdaMapper.rkSure(map);
         String result = map.get("v_result").toString();
         if ("10".equals(result)){
@@ -202,6 +217,17 @@ public class PdaServiceImp implements PdaService {
 
     }
 
+    @Override
+    public AjaxResult rkSurepk(TrayCodeMsg trayCodeMsg) {
+        HashMap<String, Object> map = new HashMap<>();
+        map.put("v_tray_code", trayCodeMsg.getTrayCode());
+        map.put("v_warehouse_id", trayCodeMsg.getWarehouseId());
+        pdaMapper.rkSure(map);
+        AjaxResult ajaxResult = mydoJobService.manualCompleted(mydoJobService.selectMydoJobByTrayCode(trayCodeMsg.getTrayCode()), 1);
+
+        return ajaxResult;
+    }
+
     @Override
     public AjaxResult ktpout(TrayCodeMsg trayCodeMsg) {
         HashMap<String, Object> map = new HashMap<>();
@@ -220,7 +246,7 @@ public class PdaServiceImp implements PdaService {
     public AjaxResult ktpin(TrayCodeMsg trayCodeMsg) {
         HashMap<String, Object> map = new HashMap<>();
         map.put("v_tray_code", trayCodeMsg.getTrayCode());
-        map.put("v_warehouse_id", trayCodeMsg.getWarehouseId());
+//        map.put("v_warehouse_id", trayCodeMsg.getWarehouseId());
         pdaMapper.ktpin(map);
         String result = map.get("v_result").toString();
         if ("10".equals(result)){