2.1.0

车间生产：五楼装配页面领辅料功能

hw-modules/hw-wms/src/main/java/com/hw/wms/service/impl/WmsRawOutstockServiceImpl.java

@@ -471,6 +471,13 @@ public class WmsRawOutstockServiceImpl implements IWmsRawOutstockService {
     @Transactional(rollbackFor = Exception.class)
     @Override
     public int applyRawOutstock(WmsRawOutstock wmsRawOutstock) {
+        String planCode = wmsRawOutstock.getPlanCode();
+        String planDetailCode = wmsRawOutstock.getPlanDetailCode();
+
+        if (StringUtils.isEmpty(planCode)) {
+            throw new ServiceException("请选择生产详细信息再领料");
+        }
+
         Long warehouseId = wmsRawOutstock.getWarehouseId();
         List<WmsRawOutstockDetail> rawOutstockDetails = wmsRawOutstock.getWmsRawOutstockDetailList();
         //根据物料ID分组获取总申请数量
@@ -484,8 +491,7 @@ public class WmsRawOutstockServiceImpl implements IWmsRawOutstockService {
         String warehouseType = baseWarehouse.getWarehouseType();
 
         String queryQualityStatus = WmsConstants.WMS_QUALITY_STATUS_PASS;
-        String planCode = wmsRawOutstock.getPlanCode();
+
-        String planDetailCode = wmsRawOutstock.getPlanDetailCode();
 
         List<WmsRawOutstock> toInsertedRawOutstocks = new ArrayList<>();
         Date currentDate = new Date();

hw-ui/src/views/board/fifthFloor/index.vue

@@ -25,10 +25,16 @@
             </el-form-item>
           </el-form>
           <div style="text-align: center">
-            <el-button type="primary" @click="getMaterials">领柜体</el-button>
+            <el-button type="success" v-if="(!$route.query || $route.query.id!=='2')" :disabled="form.planDetailStatus === '已完成' || !form.planDetailCode" @click="getMaterials('0')">领料
-            <el-button v-if="($route.query && $route.query.id) === '2'" type="info" @click="handleBindBarcode">绑定</el-button>
+            </el-button>
-            <el-button v-if="($route.query && $route.query.id) === '2'" type="warning" @click="handleRawBack">返库</el-button>
+            <el-button type="primary" v-if="($route.query && $route.query.id) === '2'" :disabled="form.planDetailStatus === '已完成' || !form.planDetailCode" @click="getMaterials('1')">
-            <el-button :disabled="form.planDetailStatus === '已完成'" type="primary" @click="finish">完成</el-button>
+              领柜体
+            </el-button>
+            <el-button v-if="($route.query && $route.query.id) === '2'" type="info" :disabled="form.planDetailStatus === '已完成' || !form.planDetailCode" @click="handleBindBarcode">绑定
+            </el-button>
+            <el-button v-if="($route.query && $route.query.id) === '2'" type="warning" :disabled="form.planDetailStatus === '已完成' || !form.planDetailCode"  @click="handleRawBack">返库
+            </el-button>
+            <el-button :disabled="form.planDetailStatus === '已完成' || !form.planDetailCode" type="primary" @click="finish">完成</el-button>
             <el-popover
               v-if="($route.query && $route.query.id) === '2'"
               v-model="assignModel"
@@ -42,7 +48,9 @@
                 </el-form-item>
                 <el-form-item label="工位">
                   <el-radio-group v-model="assignTaskForm.stationId">
-                    <el-radio v-for="i in stationData" :label="i.stationId" :value="i.stationId" :key="i.stationId">{{i.stationName}}</el-radio>
+                    <el-radio v-for="i in stationData" :label="i.stationId" :value="i.stationId" :key="i.stationId">
+                      {{ i.stationName }}
+                    </el-radio>
                   </el-radio-group>
                 </el-form-item>
               </el-form>
@@ -203,7 +211,7 @@
 
     <el-dialog
       :visible.sync="dialogVisible"
-      title="领柜体"
+      :title="applyMaterialTitle"
       width="40%">
       <el-form ref="form" :model="form1" label-width="100px">
         <el-form-item label="工单编号">
@@ -212,13 +220,13 @@
         <el-form-item label="明细编号">
           <el-input v-model="form1.planDetailCode" disabled></el-input>
         </el-form-item>
-        <el-form-item label="领柜体仓库">
+        <el-form-item label="仓库">
-          <el-select v-model="form1.warehouseId" placeholder="请选择领柜体仓库" @change="warehouseChange">
+          <el-select v-model="form1.warehouseId" placeholder="请选择仓库" @change="warehouseChange">
             <el-option v-for="item in warehouseList" :key="item.warehouseId" :label="item.warehouseName"
                        :value="item.warehouseId"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="领柜体原因">
+        <el-form-item label="领取原因">
           <el-input v-model="form1.applyReason" type="textarea"></el-input>
         </el-form-item>
       </el-form>
@@ -258,7 +266,7 @@
             <el-input
               v-model="scope.row.planAmount"
               :min="1"
-              disabled="true"
+              :disabled="planAmountDisabled"
               controls-position="right"
               style="width: 100%"
             >
@@ -293,8 +301,6 @@
     </el-dialog>
 
 
-
-
     <el-dialog
       :visible.sync="bindBarcodeVisible"
       title="柜体绑定"
@@ -413,6 +419,10 @@ export default {
       nowNum1: 1,
       totalNum1: 0,
       getMaterialsModel: false,
+      applyMaterialTitle: '',
+      planAmount : null,
+      planAmountDisabled : true,
+      taskType:'',
       dialogVisible: false,
       form: {},
       form1: {},
@@ -734,7 +744,6 @@ export default {
     },
 
 
-
     completeStation() {
       this.submitAssignLoading = true;
       this.$refs["assignTaskForm"].validate(valid => {
@@ -751,7 +760,6 @@ export default {
     },
 
 
-
     getInfo(e) {
       this.$refs.chart1_1.setData({
         series: [
@@ -1109,7 +1117,19 @@ export default {
     },
 
     // 领柜体页面
-    getMaterials() {
+    getMaterials(returnFlag) {
+      if (returnFlag == '1') {
+        this.applyMaterialTitle = "领柜体";
+        this.planAmount = 1;
+        this.planAmountDisabled = true;
+        this.taskType = '2';//拆分出库
+      } else {
+        this.applyMaterialTitle = "领料";
+        this.planAmount = null;
+        this.planAmountDisabled = false;
+        this.taskType='1';//生产领料
+      }
+
       this.searchMaterialValue = ''
       this.dialogVisible = true
       this.form1 = {
@@ -1122,10 +1142,10 @@ export default {
         wmsRawOutstockDetailList: []
       }
       // 获取仓库信息
-      getWarehouses({"warehouseFloor": 5,"returnFlag":1}).then(e => {
+      getWarehouses({"warehouseFloor": 5, "returnFlag": returnFlag}).then(e => {
         this.warehouseList = e.data
         this.form1.warehouseId = e.data[0]?.warehouseId
-        this.searchMaterial("");
+        this.searchMaterial();
       })
 
     },
@@ -1147,7 +1167,7 @@ export default {
             materialName: r.materialName,
             availableAmount: r.totalAmount - r.occupyAmount - r.frozenAmount,
             unavailableAmount: r.occupyAmount + r.frozenAmount,
-            planAmount: 1
+            planAmount: this.planAmount
           }
         })
       })
@@ -1161,7 +1181,7 @@ export default {
     },
 
     receiveMaterial() {
-      this.form1.taskType = '2';//拆分出库
+      this.form1.taskType = this.taskType;
       applyRawOutstock(this.form1).then(e => {
         if (e.code === 200) {
           this.dialogVisible = false