出库单据

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

@@ -65,6 +65,13 @@ public class PdaController extends BaseController {
         return pdaService.selectDetailByTray(trayCodeMakeSure);
     }
 
+    @RequestMapping("/selectDetailByPDTray")
+    @ResponseBody
+    public AjaxResult selectDetailByPDTray(@RequestBody TrayCodeMakeSure trayCodeMakeSure) {
+        return pdaService.selectDetailByPDTray(trayCodeMakeSure);
+    }
+
+
     /**
      * 出库确认
      *

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

@@ -15,6 +15,7 @@ public interface PdaService {
     public AjaxResult addInJob(RequestEnter requestEnter);
 
     public AjaxResult selectDetailByTray(TrayCodeMakeSure trayCodeMakeSure);
+    public AjaxResult selectDetailByPDTray(TrayCodeMakeSure trayCodeMakeSure);
 
     AjaxResult outMakeSure(TrayCodeMakeSure trayCodeMakeSure);
 

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

@@ -72,11 +72,21 @@ public class PdaServiceImp implements PdaService {
         mydoJob.setExitId(trayCodeMakeSure.getExitId());
         mydoJob.setProductId(productId);
         mydoJob.setStatus("3");
-
+        mydoJob.setInOrOut("21");
         List<MydoJobDetail> mydoJobDetails = mydoJobDetailService.selectMydoJobDetailListByExit(mydoJob);
         return AjaxResult.success(mydoJobDetails);
     }
 
+    @Override
+    public AjaxResult selectDetailByPDTray(TrayCodeMakeSure trayCodeMakeSure) {
+        MydoJob mydoJob = new MydoJob();
+        mydoJob.setExitId(trayCodeMakeSure.getExitId());
+        mydoJob.setStatus("3");
+        mydoJob.setInOrOut("26");
+        List<MydoJobDetail> mydoJobDetails = mydoJobDetailService.selectPdMydoJobDetailListByExit(mydoJob);
+        return AjaxResult.success(mydoJobDetails);
+    }
+
     @Override
     public AjaxResult outMakeSure(TrayCodeMakeSure trayCodeMakeSure) {
         String trayCode = trayCodeMakeSure.getTrayCode();
@@ -86,6 +96,7 @@ public class PdaServiceImp implements PdaService {
         mydoJob.setExitId(trayCodeMakeSure.getExitId());
         mydoJob.setProductId(productId);
         mydoJob.setStatus("3");
+        mydoJob.setInOrOut("21");
         List<MydoJobDetail> mydoJobDetails = mydoJobDetailService.selectMydoJobDetailListByExit(mydoJob);
         if(mydoJobDetails.size()==0){
             return AjaxResult.error("该物料没有出库作业，请检查");

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

@@ -372,7 +372,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         and mj.status='3'
           and mj.execution_phase=2
         and mjd.product_id=#{productId}
-        and mj.in_or_out>=20
+        and mj.in_or_out=#{inOrOut}
 
     </select>
     <select id="selectPdMydoJobDetailListByExit" parameterType="MydoJob" resultMap="MydoJobDetailResult">

ruoyi-admin/src/main/resources/mapper/out/OutStockoutDetailFinishMapper.xml

@@ -46,6 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="lotNo"    column="lot_no"    />
         <result property="productGuid"    column="product_guid"    />
         <result property="productId"    column="product_id"    />
+        <result property="productName"    column="product_name"    />
         <result property="quantity"    column="quantity"    />
         <result property="quantityX"    column="quantity_x"    />
         <result property="quantityJ"    column="quantity_j"    />

ruoyi-ui/src/views/stock/pointOut.vue

@@ -27,10 +27,10 @@
       </el-form-item>
 
 
-      <el-form-item label="物料名称" prop="productName"><!-- 物料描述 -->
+      <el-form-item label="品名" prop="productName"><!-- 物料描述 -->
         <el-input
           v-model="queryParams.productName"
-          placeholder="请输入物料名称"
+          placeholder="请输入品名"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -63,8 +63,8 @@
       <el-table-column label="货位名称" align="center" prop="cargoSpaceName"  width="160"/>
       <el-table-column label="批次号" align="center" prop="lotNo" />
       <el-table-column label="订单号" align="center" prop="orderId" width="160"/>
-      <el-table-column label="物料编码" align="center" prop="productId" />
+      <el-table-column label="品号" align="center" prop="productId" />
-      <el-table-column label="物料名称" align="center" prop="productName" />
+      <el-table-column label="品名" align="center" prop="productName" />
       <el-table-column label="数量" align="center" prop="quantity" width="80" />
       <el-table-column label="规格" align="center" prop="spare1" />
       <el-table-column label="单位" align="center" prop="spare3" />
@@ -177,7 +177,7 @@ export default {
         pageSize: 10,
         stockId: null,
         cargoSpaceStockStatus:'2',
-        cargoSpaceId: null,
+        cargoSpaceName: null,
         stockStatus: null,
         productStatus: null,
         lotNo: null,
@@ -295,6 +295,7 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm")
+      this.queryParams.inDate = null
       this.handleQuery()
     },
     // 多选框选中数据