修改查询条件

ruoyi-admin/src/main/java/com/ruoyi/receive/stockin/service/impl/ReceiveStockinServiceImpl.java

@@ -229,8 +229,9 @@ public class ReceiveStockinServiceImpl implements IReceiveStockinService
 
                     }
                 }
+            }else {
+                return AjaxResult.error("单据不存在");
             }
-
         }catch (Exception e){
             throw new RuntimeException(e);
         }

ruoyi-ui/src/lang/zh.js

@@ -158,9 +158,11 @@ export default {
     startTime: '开始时间',
     finishTime: '结束时间',
     entranceId: '入口ID',
+    entrance: '入口',
     exitId: '出口ID',
     classId: '班组ID',
     warehouseId: '仓库ID',
+    warehouse: '仓库',
     faultFlag: '重分标记',
     jobDetailId: '子任务ID',
     stockId: '库存ID',

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

@@ -19,16 +19,6 @@
           />
         </el-select>
       </el-form-item>
-<!--      <el-form-item label="上线类型" prop="onLineType">
-        <el-select v-model="queryParams.onLineType" placeholder="请选择上线类型" clearable>
-          <el-option
-            v-for="dict in dict.type.on_line_type"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>-->
       <el-form-item :label="$t('inJob.taskNo')" prop="taskNo">
         <el-input
           v-model="queryParams.taskNo"
@@ -37,30 +27,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-<!--      <el-form-item label="供应商ID" prop="supplierId">
-        <el-input
-          v-model="queryParams.supplierId"
-          placeholder="请输入供应商ID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="客户ID" prop="customerId">
-        <el-input
-          v-model="queryParams.customerId"
-          placeholder="请输入客户ID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="部门ID" prop="departmentId">
-        <el-input
-          v-model="queryParams.departmentId"
-          placeholder="请输入部门ID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>-->
       <el-form-item :label="$t('inJob.trayCode')" prop="trayCode">
         <el-input
           v-model="queryParams.trayCode"
@@ -69,62 +35,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-<!--      <el-form-item label="巷道ID" prop="roadwayId">
+
-        <el-input
-          v-model="queryParams.roadwayId"
-          placeholder="请输入巷道ID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>-->
-<!--      <el-form-item label="货位ID" prop="cargoSpaceId">
-        <el-input
-          v-model="queryParams.cargoSpaceId"
-          placeholder="请输入货位ID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>-->
-<!--      <el-form-item label="目标巷道ID" prop="targetRoadwayId">
-        <el-input
-          v-model="queryParams.targetRoadwayId"
-          placeholder="请输入目标巷道ID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>-->
-      <el-form-item :label="$t('inJob.targetCargoSpaceId')" prop="targetCargoSpaceId">
-        <el-input
-          v-model="queryParams.targetCargoSpaceId"
-          :placeholder="$t('inJob.inputTargetCargoSpaceId')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-<!--      <el-form-item label="产线ID" prop="lineId">
-        <el-input
-          v-model="queryParams.lineId"
-          placeholder="请输入产线ID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="车间ID" prop="workshopId">
-        <el-input
-          v-model="queryParams.workshopId"
-          placeholder="请输入车间ID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="优先级" prop="priority">
-        <el-input
-          v-model="queryParams.priority"
-          placeholder="请输入优先级"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>-->
       <el-form-item :label="$t('inJob.executionPhase')" prop="executionPhase">
         <el-select v-model="queryParams.executionPhase" :placeholder="$t('inJob.selectExecutionPhase')" clearable>
           <el-option
@@ -169,22 +80,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item :label="$t('inJob.exitId')" prop="exitId">
-        <el-input
-          v-model="queryParams.exitId"
-          :placeholder="$t('inJob.inputExitId')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-<!--      <el-form-item label="班组ID" prop="classId">
-        <el-input
-          v-model="queryParams.classId"
-          placeholder="请输入班组ID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>-->
       <el-form-item :label="$t('inReceiveStockin.warehouseId')" prop="warehouseId"><!--仓库-->
         <el-select
           v-model="queryParams.warehouseId"
@@ -271,18 +166,15 @@
       <el-table-column :label="$t('inJob.supplierName')" align="left" prop="supplierName" key="supplierId" value="supplierName" /> // 供应商
       <el-table-column :label="$t('inJob.departmentName')" align="left" prop="departmentName" /> // 部门
       <el-table-column :label="$t('inJob.trayCode')" align="left" prop="trayCode" /> // 托盘码
-      <el-table-column :label="$t('inJob.roadwayId')" align="left" prop="roadwayId" /> // 巷道ID
       <el-table-column :label="$t('inJob.cargoSpaceName')" align="left" prop="cargoSpaceName" /> // 货位
-      <el-table-column :label="$t('inJob.targetRoadwayId')" align="left" prop="targetRoadwayId" /> // 目标巷道
-      <el-table-column :label="$t('inJob.targetCargoSpaceName')" align="left" prop="targetCargoSpaceName" /> // 目标货位
-      <el-table-column :label="$t('inJob.lineId')" align="left" prop="lineId" /> // 产线ID
-      <el-table-column :label="$t('inJob.workshopId')" align="left" prop="workshopId" /> // 车间ID
       <el-table-column :label="$t('inJob.priority')" align="left" prop="priority" /> // 优先级
       <el-table-column :label="$t('inJob.executionPhase')" align="left" prop="executionPhase"> // 执行阶段
         <template slot-scope="scope">
           <dict-tag :options="dict.type.execution_phase_type" :value="scope.row.executionPhase"/>
         </template>
       </el-table-column>
+      <el-table-column :label="$t('inJob.entrance')" align="left" prop="entranceId" /> // 入口ID
+      <el-table-column :label="$t('inJob.warehouse')" align="left" prop="warehouseName" /> // 仓库ID
       <el-table-column :label="$t('inJob.startTime')" align="left" prop="startTime" width="180"> // 开始时间
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.startTime, '{y}-{m}-{d}') }}</span>
@@ -293,10 +185,7 @@
           <span>{{ parseTime(scope.row.finishTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('inJob.entranceId')" align="left" prop="entranceId" /> // 入口ID
+
-      <el-table-column :label="$t('inJob.classId')" align="left" prop="classId" /> // 班组ID
-      <el-table-column :label="$t('inJob.warehouseId')" align="left" prop="warehouseId" /> // 仓库ID
-      <el-table-column :label="$t('inJob.faultFlag')" align="left" prop="faultFlag" /> // 重分标记
     </el-table>
 
     <pagination
@@ -313,16 +202,9 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column :label="$t('inJob.jobDetailId')" align="left" prop="jobDetailId" />
       <el-table-column :label="$t('inJob.jobId')" align="left" prop="jobId" /> // 任务ID
-<!--      <el-table-column :label="$t('inJob.stockId')" align="center" prop="stockId" /> // 库存ID-->
+
-      <el-table-column :label="$t('inJob.lotNo')" align="left" prop="lotNo" /> // 批次号
-      <el-table-column :label="$t('inJob.inDate')" align="left" prop="inDate" width="180"> // 入库时间
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.inDate, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
       <el-table-column :label="$t('inJob.inOrOutId')" align="left" prop="inOrOutId" /> // 单据ID
       <el-table-column :label="$t('inJob.inOrOutDId')" align="left" prop="inOrOutDId" /> // 子单据ID
-<!--      <el-table-column :label="$t('inJob.productGuid')" align="center" prop="productGuid" /> // 物料GUID-->
       <el-table-column :label="$t('inJob.productId')" align="left" prop="productId" /> // 物料编码
       <el-table-column :label="$t('inJob.materialDesc')" align="left" prop="extraField.materialDesc" /> // 物料描述
       <el-table-column :label="$t('inJob.englishDesc')" align="left" prop="extraField.englishDesc" /> // 英文描述
@@ -331,15 +213,12 @@
       <el-table-column :label="$t('inJob.netWeight')" align="right" width="120px" prop="extraField.netWeight" /> // 净重
       <el-table-column :label="$t('inJob.totalNetWeight')" align="right" prop="extraField.totalNetWeight" /> // 总净重
       <el-table-column :label="$t('inJob.grossWeight')" align="right" prop="extraField.grossWeight" /> // 毛重
-
-<!--      <el-table-column :label="$t('inJob.stockStatus')" align="center" prop="stockStatus" /> // 库存状态-->
       <el-table-column :label="$t('inJob.inQuantity')" align="right" prop="inQuantity" /> // 入库数量
-<!--      <el-table-column :label="$t('inJob.printDate')" align="center" prop="printDate" /> // 生产日期-->
+      <el-table-column :label="$t('inJob.inDate')" align="left" prop="inDate" width="180"> // 入库时间
-<!--      <el-table-column :label="$t('inJob.supplierId')" align="center" prop="supplierId" /> // 供应商ID-->
+        <template slot-scope="scope">
-<!--      <el-table-column label="备用字段1" align="center" prop="spare1" />
+          <span>{{ parseTime(scope.row.inDate, '{y}-{m}-{d}') }}</span>
-      <el-table-column label="备用字段2" align="center" prop="spare2" />
+        </template>
-      <el-table-column label="备用字段3" align="center" prop="spare3" />
+      </el-table-column>
-      <el-table-column label="备用字段4" align="center" prop="spare4" />-->
     </el-table>
 
     <pagination
@@ -426,6 +305,10 @@ export default {
         jobId: null,
         status: null,
       },
+      queryWarehouseParams:{
+        pageNum: 1,
+        pageSize: 99,
+      },
       // 表单参数
       form: {},
       // 表单校验
@@ -450,7 +333,7 @@ export default {
   methods: {
     /** 获取仓库列表 */
     getWarehouseList() {
-      listWarehouse().then(response => {
+      listWarehouse(this.queryWarehouseParams).then(response => {
         this.warehouseOptions = response.rows;
         if (this.warehouseOptions.length > 0) {
           this.handleQuery();

ruoyi-ui/src/views/in/receive/add/index.vue

@@ -92,7 +92,7 @@
         </el-table-column>
         <el-table-column :label="$t('receiveStockinAdd.price')" align="right" prop="price" /><!--价格-->
         <el-table-column :label="$t('receiveStockinAdd.remark')" align="center" prop="remark" /><!--描述-->
-        <el-table-column :label="$t('receiveStockinAdd.batchNumber')" width="120" align="center">
+<!--        <el-table-column :label="$t('receiveStockinAdd.batchNumber')" width="120" align="center">
           <template slot-scope="scope">
             <el-input
               v-model="scope.row.lotNo"
@@ -100,7 +100,7 @@
               required="required"
             />
           </template>
-        </el-table-column>
+        </el-table-column>-->
         <el-table-column :label="$t('receiveStockinAdd.quantity')" width="120" align="right">
           <template slot-scope="scope">
             <el-input-number
@@ -266,6 +266,11 @@ export default {
       queryProductParams: {
         pageNum: 1,
         pageSize: 5
+      },
+       //仓库查询参数
+      queryWarehouseParams: {
+        pageNum: 1,
+        pageSize: 99
       },
       //物料遮盖
       productLoading: true,
@@ -294,7 +299,7 @@ export default {
   methods: {
     /** 获取仓库列表 */
     getWarehouseList() {
-      listWarehouse().then(response => {
+      listWarehouse(this.queryWarehouseParams).then(response => {
         this.warehouseOptions = response.rows;
       });
     },
@@ -400,7 +405,7 @@ export default {
             return;
           }
           //校验lotNo productGuid quantity 不能为空
-          if (this.productList.some(item => !item.lotNo || !item.productGuid || !item.quantity)) {
+          if (this.productList.some(item =>  !item.productGuid || !item.quantity)) {
             this.$modal.msgError(this.$t('receiveStockinAdd.materialInfoRequired'));
             return;
           }

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

@@ -132,14 +132,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item :label="$t('inReceiveStockin.lotNo')" prop="stockSource"><!--批号-->
+<!--      <el-form-item :label="$t('inReceiveStockin.lotNo')" prop="stockSource">&lt;!&ndash;批号&ndash;&gt;
         <el-input
           v-model="queryParams.lotNo"
           :placeholder="$t('inReceiveStockin.inputLotNo')"
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item>-->
       <el-form-item :label="$t('inReceiveStockin.warehouseId')" prop="warehouseId"><!--仓库-->
         <el-select
           v-model="queryParams.warehouseId"
@@ -230,7 +230,11 @@
       <el-table-column type="selection" width="55" align="center"/>
       <!-- <el-table-column label="GUID" align="center" prop="stockinGuid" /> -->
       <el-table-column :label="$t('inReceiveStockin.stockinId')" align="left" prop="stockinId"/><!--入库订单-->
-      <el-table-column :label="$t('inReceiveStockin.inType')" align="left" prop="inType"/><!--入库类型-->
+      <el-table-column :label="$t('inReceiveStockin.inType')" align="left" prop="inType">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.in_bill_type" :value="scope.row.inType"/>
+        </template>
+      </el-table-column><!--入库类型-->
 
       <el-table-column :label="$t('inReceiveStockin.status')" align="left" prop="status"><!--单据状态-->
         <template slot-scope="scope">
@@ -310,7 +314,7 @@
       <el-table-column :label="$t('inReceiveStockin.stockinDetailId')" align="left" prop="stockinDetailId"/><!--子单ID-->
       <!-- <el-table-column label="主单GUID" align="center" prop="stockinGuid" /> -->
       <el-table-column :label="$t('inReceiveStockin.stockinId')" align="left" prop="stockinId"/><!--主单ID-->
-      <el-table-column :label="$t('inReceiveStockin.lotNo')" align="left" prop="lotNo"/><!--批次号-->
+<!--      <el-table-column :label="$t('inReceiveStockin.lotNo')" align="left" prop="lotNo"/>&lt;!&ndash;批次号&ndash;&gt;-->
 <!--      <el-table-column label="物料ID" align="center" prop="productGuid"/>-->
       <el-table-column :label="$t('inReceiveStockin.productId')" align="left" prop="productId"/><!--物料编码-->
       <el-table-column :label="$t('inReceiveStockin.materialDesc')" align="left" prop="extraField.materialDesc"/><!--物料描述-->
@@ -396,7 +400,7 @@ import { getDicts } from "@/api/system/dict/data"
 
 export default {
   name: "Stockin",
-  dicts: ['receive_bill_status'],
+  dicts: ['receive_bill_status','in_bill_type'],
   data() {
     return {
       // 仓库选项列表
@@ -455,6 +459,10 @@ export default {
         pageSize: 10,
         stockinId: null
       },
+      queryWarehouseParams: {
+        pageNum: 1,
+        pageSize: 99,
+      },
       // 表单参数
       form: {},
       // 表单校验
@@ -658,7 +666,7 @@ export default {
     },
     /** 获取仓库列表 */
     getWarehouseList() {
-      listWarehouse().then(response => {
+      listWarehouse(this.queryWarehouseParams).then(response => {
         this.warehouseOptions = response.rows;
         if (this.warehouseOptions.length > 0) {
           this.queryParams.warehouseId = this.warehouseOptions[0].warehouseId;

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

@@ -17,14 +17,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item :label="$t('inReceiveStockin.lotNo')" prop="lotNo"><!--批号-->
+
-        <el-input
-          v-model="queryParams.lotNo"
-          :placeholder="$t('inReceiveStockin.inputLotNo')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item :label="$t('inReceiveStockin.inType')" prop="inType"><!--入库类型-->
         <el-select v-model="queryParams.inType" :placeholder="$t('inReceiveStockin.selecInType')" clearable>
           <el-option
@@ -303,7 +296,7 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column :label="$t('inReceiveStockin.stockinDetailId')" align="left" prop="stockinDetailId"/><!--子单ID-->
       <el-table-column :label="$t('inReceiveStockin.stockinId')" align="left" prop="stockinId"/><!--主单ID-->
-      <el-table-column :label="$t('inReceiveStockin.lotNo')" align="left" prop="lotNo"/><!--批次号-->
+<!--      <el-table-column :label="$t('inReceiveStockin.lotNo')" align="left" prop="lotNo"/>&lt;!&ndash;批次号&ndash;&gt;-->
       <el-table-column :label="$t('inReceiveStockin.productId')" align="left" prop="productId"/><!--物料编码-->
       <el-table-column :label="$t('inReceiveStockin.materialDesc')" align="left" prop="extraField.materialDesc"/><!--物料描述-->
       <el-table-column :label="$t('inReceiveStockin.englishDesc')" align="left" prop="extraField.englishDesc"/><!--英文描述-->
@@ -404,6 +397,10 @@ export default {
         pageSize: 10,
         stockinId: null
       },
+      queryWarehouseParams:{
+        pageNum: 1,
+        pageSize: 99
+      },
       // 表单参数
       form: {},
       // 表单校验
@@ -430,7 +427,7 @@ export default {
   methods: {
     /** 获取仓库列表 */
     getWarehouseList() {
-      listWarehouse().then(response => {
+      listWarehouse(this.queryWarehouseParams).then(response => {
         this.warehouseOptions = response.rows;
         if (this.warehouseOptions.length > 0) {
           this.handleQuery();

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

@@ -296,6 +296,11 @@ export default {
         status:null,
         stockoutGuid:null
 
+      },
+      warehouseQueryParams: {
+        pageNum: 1,
+        pageSize: 99,
+
       },
       // 子表总条数
       detailTotal: 0
@@ -308,7 +313,7 @@ export default {
   methods: {
     /** 获取仓库列表 */
     getWarehouseList() {
-      listWarehouse().then(response => {
+      listWarehouse(this.warehouseQueryParams).then(response => {
         this.warehouseOptions = response.rows;
         if (this.warehouseOptions.length > 0) {
           this.handleQuery();