diff --git a/ruoyi-admin/src/main/java/com/ruoyi/pda/controller/PdaController.java b/ruoyi-admin/src/main/java/com/ruoyi/pda/controller/PdaController.java index bc44e3c..7fcc1e8 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/pda/controller/PdaController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/pda/controller/PdaController.java @@ -8,6 +8,7 @@ import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.in.stockindetail.domain.InStockinDetail; import com.ruoyi.in.stockindetail.service.IInStockinDetailService; +import com.ruoyi.job.mydojobdetail.domain.MydoJobDetail; import com.ruoyi.pda.domain.TrayCodeMakeSure; import com.ruoyi.pda.domain.TrayCodeMsg; import com.ruoyi.pda.service.PdaService; @@ -201,6 +202,27 @@ public class PdaController extends BaseController { return AjaxResult.success(pdaService.selectBasStockHc(trayCodeMakeSure.getTrayCode())); } + /** + * 立库出库信息校验 + * @param trayCodeMakeSure + * @return + */ + @RequestMapping("/verifyMaterial") + @ResponseBody + public AjaxResult verifyMaterial(@RequestBody TrayCodeMakeSure trayCodeMakeSure) { + String trayCode = trayCodeMakeSure.getTrayCode(); + List mydoJobDetailList = trayCodeMakeSure.getMydoJobDetailList(); + for (MydoJobDetail m : mydoJobDetailList ) { + Integer count = pdaService.selectByTrayCodeAndProduct(trayCode, m.getProductId()); + if (count == 0) { + return AjaxResult.error(m.getProductId() + ",物料不是出库wuliao"); + } + } + + return AjaxResult.success(); + } + + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/pda/mapper/PdaMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/pda/mapper/PdaMapper.java index 34a5a9c..3782b73 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/pda/mapper/PdaMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/pda/mapper/PdaMapper.java @@ -1,5 +1,7 @@ package com.ruoyi.pda.mapper; +import org.apache.ibatis.annotations.Param; + import java.util.HashMap; public interface PdaMapper { @@ -42,4 +44,6 @@ public interface PdaMapper { void hcoutMakesure(HashMap map); void completeInPk(HashMap map); + + Integer selectByTrayCodeAndProduct(@Param("trayCode") String trayCode, @Param("productId") String productId); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaService.java b/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaService.java index 515c1ec..6e4719c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaService.java @@ -61,4 +61,6 @@ public interface PdaService { AjaxResult completeInPk(TrayCodeMakeSure trayCodeMakeSure); AjaxResult selectBasStockHc(String trayCode); + + Integer selectByTrayCodeAndProduct(String trayCode, String productId); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java b/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java index c58b71a..9d88383 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java @@ -326,4 +326,9 @@ public class PdaServiceImp implements PdaService { List stocks=basStockMapper.selectBasStockListHc(basStock); return AjaxResult.success(stocks); } + + @Override + public Integer selectByTrayCodeAndProduct(String trayCode, String productId) { + return pdaMapper.selectByTrayCodeAndProduct(trayCode,productId); + } } diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/pda/PdaMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/pda/PdaMapper.xml index 58b2a9c..7621c7a 100644 --- a/ruoyi-admin/src/main/resources/mapper/mapper/pda/PdaMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/mapper/pda/PdaMapper.xml @@ -162,6 +162,12 @@ #{v_result,mode=OUT,jdbcType=INTEGER}, #{v_result_msg,mode=OUT,jdbcType=VARCHAR})} +