盘点出库、入库页面显示

ruoyi-admin/src/main/java/com/ruoyi/check/stockcheck/service/impl/CheckStockinServiceImpl.java

@@ -201,7 +201,7 @@ public class CheckStockinServiceImpl implements ICheckStockinService
             //货位盘点
             for (int i = 0; i < detailList.size(); i++) {
                 BasStock param = new BasStock();
-                param.setCargoSpaceId(detailList.get(i).getSpare1());
+                param.setCargoSpaceId(detailList.get(i).getCargoSpaceId());
                 List<BasStock> basStocks = basStockService.selectBasStockList(param);
                 Integer quantity = 0;
                 for (BasStock basStock : basStocks) {

ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckdetail/domain/CheckStockinDetail.java

@@ -169,4 +169,5 @@ public class CheckStockinDetail extends BaseEntity
     private String supplierName;
 
 
+
 }

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

@@ -538,10 +538,20 @@ public class MydoJobServiceImpl implements IMydoJobService {
             BigDecimal subtract = stockInNum.subtract(jobOutNum);
             checkStockinDetail.setScanNum(Convert.toStr(subtract));
             checkStockinDetailService.updateCheckStockinDetail(checkStockinDetail);
+
+            String stockId = mydoJobDetail.getStockId();
+            BasStock basStock = basStockService.selectBasStockByStockId(stockId);
+            if (basStock != null) {
+                BigDecimal outQuantity = Convert.toBigDecimal(basStock.getOutQuantity());
+                BigDecimal substract = outQuantity.subtract(Convert.toBigDecimal(mydoJobDetail.getOutQuantity()));
+                basStock.setOutQuantity(String.valueOf(substract));
+                basStockService.updateBasStock(basStock);
+            }
+
         }
         //修改货位状态
         BasCargoSpace basCargoSpace = basCargoSpaceService.selectBasCargoSpaceByCargoSpaceId(job.getCargoSpaceId());
-        basCargoSpace.setStatus("1");
+        basCargoSpace.setStatus("2");
         basCargoSpaceService.updateBasCargoSpace(basCargoSpace);
 
         mydoJob.setStatus("5");

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

@@ -151,6 +151,7 @@ public class MydoJobDetail extends BaseEntity
     @Excel(name = "机型")
     private String unit;
     private String trayCode;
+    private String cargoNo;
 
 
 

ruoyi-admin/src/main/resources/mapper/check/CheckStockinDetailMapper.xml

@@ -36,6 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="spare5"    column="spare5"    />
         <result property="spare6"    column="spare6"    />
         <result property="cargoSpaceName"    column="cargo_space_name"    />
+        <result property="cargoSpaceId"    column="cargo_space_id"    />
         <result property="spare7"    column="spare7"    />
         <result property="spare8"    column="spare8"    />
         <result property="spare9"    column="spare9"    />
@@ -43,6 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="orderId"    column="order_id"    />
         <result property="supplierName"    column="supplier_name"    />
 
+
     </resultMap>
 
     <sql id="selectCheckStockinDetailVo">
@@ -60,7 +62,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                bp.unit ,
                bp.cargo_no,
                bp.spec,
-               bs.supplier_name
+               bs.supplier_name,
+               csd.cargo_space_id
         from check_stockin_detail csd
         left join bas_product bp on csd.product_id = bp.product_id
         left join bas_cargo_space bcs on csd.cargo_space_id = bcs.cargo_space_id

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

@@ -39,6 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="spare9"    column="spare9"    />
         <result property="spec"    column="spec"    />
         <result property="unit"    column="unit"    />
+        <result property="cargoNo"    column="cargo_no"    />
         <result property="productName"    column="product_name"    />
         <result property="supplierName"    column="supplier_name"    />
 
@@ -147,8 +148,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                mjd.spare7,
                mjd.spare8,
                mjd.spare9,
-               mjd.spec,
+               bp.spec,
-               mjd.unit,
+               bp.unit,
+               bp.cargo_no,
                bs.supplier_name
         from mydo_job_detail_finish mjd
                  left join bas_product bp on mjd.product_id = bp.product_id

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

@@ -23,6 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="giveNum"    column="give_num"    />
         <result property="stockinId"    column="stockin_id"    />
         <result property="stackingId"    column="stacking_id"    />
+        <result property="cargoNo"    column="cargo_no"    />
         <result property="exitId"    column="exit_id"    />
         <result property="printDate"    column="print_date"    />
         <result property="customerId"    column="customer_id"    />
@@ -80,8 +81,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         mjd.spare7,
         mjd.spare8,
         mjd.spare9,
-        mjd.spec,
+        bp.spec,
-        mjd.unit,
+        bp.unit,
+        bp.cargo_no,
         bs.supplier_name
 
         from mydo_job_detail mjd

ruoyi-ui/src/views/check/create/index.vue

@@ -35,6 +35,8 @@
 
       <!-- 物资明细表格 -->
       <el-table v-loading="loading" :data="materialList">
+
+        <el-table-column label="货位编码" align="left" prop="cargoSpaceId" width="160"/>
         <el-table-column label="物资编号" align="left" prop="productId" />
         <el-table-column label="物资名称" align="left" prop="productName" />
         <el-table-column label="批号" align="left" prop="lotNo"/>
@@ -529,24 +531,35 @@
 
         this.materialList = this.materialList.concat(
           newTrays.map(item => ({
-            trayCode: item.trayCode,
+            productId: item.productId,
+            productGuId: item.productGuid,
+            productName: item.productName,
+            quantity: item.quantity,
+            lotNo: item.lotNo,
+            onlyIdentity: item.onlyIdentity,
             warehouseId: item.warehouseId,
             warehouseName: item.warehouseName,
             cargoSpaceId: item.cargoSpaceId,
             cargoSpaceName: item.cargoSpaceName,
-            spec: item.spare1,
+            spec: item.spec,
-            // spare3: item.spare3,
+            spare1: item.spare1,
-            spare1: item.spare4,
+            spare2: item.voltage,
-            spare3: item.spare5,
+            spare3: item.spare3,
-            spare4: item.spare6,
+            spare4: item.spare4,
-            spare5: item.voltage,
+            spare5: item.spare5,
-            spare6: item.power,
+            spare6: item.orderId,
-            spare7: item.phase,
+            spare7: item.power,
-            spare2: item.netWeight,
+            spare8: item.spare8,
-            spare8: item.grossWeight,
             spare9: item.distribution,
-            unit: item.model,
+            unit: item.unit,
-            // orderId: item.orderId
+            orderId: item.orderId,
+            price: item.spare6,
+            productStatus: item.productStatus,
+            parentId: item.parentId,
+            createSys: item.createSys,
+            supplierName: item.supplierName,
+            supplierId: item.phase,
+            trayCode: item.trayCode
           }))
         );
         this.materialDialogByTrayCode = false;

ruoyi-ui/src/views/check/job/in/index.vue

@@ -187,7 +187,7 @@
       <el-table-column label="物料名称" align="left" prop="productName" />
       <el-table-column label="批号" align="left" prop="lotNo" />
       <el-table-column label="入库数量" align="right" prop="inQuantity" />
-      <el-table-column label="生产图号" align="left" prop="stackingId" />
+      <el-table-column label="生产图号" align="left" prop="cargoNo" />
       <el-table-column label="单价" align="left" prop="printDate" />
       <el-table-column label="供应商" align="left" prop="supplierName" />
       <el-table-column label="来源" align="left" prop="spare1" ><!--来源-->

ruoyi-ui/src/views/check/job/out/index.vue

@@ -80,7 +80,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-<!--      <el-form-item label="仓库" prop="warehouseId">
+      <el-form-item label="仓库" prop="warehouseId">
         <el-select
           v-model="queryParams.warehouseId"
           placeholder="请选择仓库"
@@ -94,7 +94,7 @@
             :value="item.warehouseId"
           />
         </el-select>
-      </el-form-item>-->
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -146,7 +146,7 @@
 <!--      <el-table-column label="部门" align="left" prop="departmentName" />-->
 <!--      <el-table-column label="托盘码" align="left" prop="trayCode" />-->
       <el-table-column label="货位" align="left" prop="cargoSpaceName" />
-      <el-table-column label="订单号" align="right" prop="lineId" />
+<!--      <el-table-column label="订单号" align="right" prop="lineId" />-->
 <!--      <el-table-column label="执行阶段" align="left" prop="executionPhase">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.execution_phase_type" :value="scope.row.executionPhase"/>
@@ -158,7 +158,7 @@
       </el-table-column>
       <el-table-column label="开始时间" align="left" prop="startTime" width="180"/>
       <el-table-column label="结束时间" align="left" prop="finishTime" width="180"/>
-<!--      <el-table-column label="仓库" align="left" prop="warehouseName" />-->
+      <el-table-column label="仓库" align="left" prop="warehouseName" />
 
     </el-table>
 
@@ -171,25 +171,48 @@
     />
 
     <el-table v-loading="loading" :data="mydoJobDetailList" @selection-change="handleSelectionChange">
-      <el-table-column label="子任务ID" align="left" prop="jobDetailId" width="160" />
+      <el-table-column label="子任务ID" align="left" prop="jobDetailId" width="150" />
-      <el-table-column label="任务ID" align="left" prop="jobId" width="160" />
+      <el-table-column label="任务ID" align="left" prop="jobId" width="140" />
-      <el-table-column label="单据ID" align="left" prop="inOrOutId" width="160" />
+      <el-table-column label="单据ID" align="left" prop="inOrOutId" width="150" />
       <el-table-column label="子单据ID" align="left" prop="inOrOutDId" width="160" />
-      <el-table-column label="库存ID" align="left" prop="stockId" width="160" />
+      <el-table-column label="物料编码" align="left" prop="productId" width="140" />
-      <el-table-column label="物料编码" align="left" prop="productId" />
+      <el-table-column label="物料名称" align="left" prop="productName" />
-      <el-table-column label="物料名称" align="left" prop="productName" width="160" />
+      <el-table-column label="批号" align="left" prop="lotNo" />
-      <el-table-column label="出库数量" align="right" prop="outQuantity" /> <!-- 出库数量 -->
+      <el-table-column label="出库数量" align="right" prop="outQuantity" />
-      <el-table-column label="机型" align="left" prop="unit"/><!--机型-->
+      <el-table-column label="生产图号" align="left" prop="cargoNo" />
-      <el-table-column label="分销" align="left" prop="spare9"/><!--分销-->
+      <el-table-column label="单价" align="left" prop="printDate" />
-      <el-table-column label="规格" align="left" prop="spec"/><!--规格-->
+      <el-table-column label="供应商" align="left" prop="supplierName" />
-      <el-table-column label="型号" align="left" prop="spare1"/><!--型号-->
+      <el-table-column label="来源" align="left" prop="spare1" ><!--来源-->
-      <el-table-column label="净重" align="left" prop="spare2"/><!--净重-->
+        <template slot-scope="scope">
-      <el-table-column label="颜色" align="left" prop="spare3"/><!--颜色-->
+          <dict-tag :options="dict.type.origin_type" :value="scope.row.spare1"/>
-      <el-table-column label="序列号" align="left" prop="spare4"/><!--序列号-->
+        </template>
-      <el-table-column label="电压" align="left" prop="spare5"/><!--电压-->
+      </el-table-column>
-      <el-table-column label="功率" align="left" prop="spare6"/><!--功率-->
+      <el-table-column label="状态" align="left" prop="spare2" ><!--用途-->
-      <el-table-column label="相位" align="left" prop="spare7"/><!--相位-->
+        <template slot-scope="scope">
-      <el-table-column label="毛重" align="left" prop="spare8"/><!--毛重-->
+          <dict-tag :options="dict.type.turnover_type" :value="scope.row.spare2"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="套账" align="left" prop="spare3" ><!--用途-->
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.account_type" :value="scope.row.spare3"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="用途" align="left" prop="spare4" ><!--用途-->
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.purpose_type" :value="scope.row.spare4"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="台次" align="left" prop="spare5" />
+      <el-table-column label="合同号" align="left" prop="spare6" />
+      <el-table-column label="件次" align="left" prop="spare7" />
+      <el-table-column label="质量等级" align="left" prop="spare8" ><!--用途-->
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.quality_type" :value="scope.row.spare8"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="管理号" align="left" prop="spare9" />
+      <el-table-column label="规格" align="left" prop="spec" />
+      <el-table-column label="单位" align="left" prop="unit" />
     </el-table>
 
     <pagination
@@ -211,7 +234,7 @@ import {listWarehouse} from "@/api/bas/warehouse";
 
 export default {
   name: "MydoJob",
-  dicts: ['execution_phase_type', 'check_out_job_type', 'on_line_type', 'mydo_job_status'],
+  dicts: ['execution_phase_type', 'check_out_job_type', 'on_line_type', 'mydo_job_status', 'sys_yes_no', 'product_type', 'quality_type', 'turnover_type', 'sys_yes_no', 'account_type', 'origin_type', 'purpose_type',],
   data() {
     return {
       warehouseOptions:[],

ruoyi-ui/src/views/check/stockCheck/index.vue

@@ -129,6 +129,7 @@
     <el-table v-loading="detailLoading" :data="stockCheckDetailList" @selection-change="handleDetailSelectionChange">
       <el-table-column label="子单ID" align="left" prop="stockCheckDetailId" width="160"/><!--子单ID-->
       <el-table-column label="主单ID" align="left" prop="stockCheckId" width="160"/><!--主单ID-->
+      <el-table-column label="货位编码" align="left" prop="cargoSpaceId" width="160"/>
       <el-table-column label="物料编码" align="left" prop="productId"/><!--物料编码-->
       <el-table-column label="物料名称" align="left" prop="productName" width="160"/><!--物料编码-->
       <el-table-column label="供应商" align="left" prop="supplierName" width="160"/><!--供应商-->

ruoyi-ui/src/views/in/job/index.vue

@@ -181,7 +181,7 @@
       <el-table-column label="物料名称" align="left" prop="productName" />
       <el-table-column label="批号" align="left" prop="lotNo" />
       <el-table-column label="入库数量" align="right" prop="inQuantity" />
-      <el-table-column label="生产图号" align="left" prop="stackingId" />
+      <el-table-column label="生产图号" align="left" prop="cargoNo" />
       <el-table-column label="单价" align="left" prop="printDate" />
       <el-table-column label="供应商" align="left" prop="supplierName" />
       <el-table-column label="来源" align="left" prop="spare1" ><!--来源-->