前端逻辑调整

src/main/java/com/imcs/admin/business/service/impl/OrderServiceImpl.java

@@ -152,6 +152,7 @@ public class OrderServiceImpl extends BaseServiceImpl implements OrderService {
         wInventoryTransactionTask.setStartPosition(orders.getStartPosition());
         wInventoryTransactionTask.setEndPosition(orders.getEndPosition());
         wInventoryTransactionTask.setVectorCode(orders.getVectorCode());
+        wInventoryTransactionTask.setEntryPoint(orders.getStartPosition());
         wInventoryTransactionTask.setStatus(0);
         wInventoryTransactionTask.setTaskType(2);
         wInventoryTransactionTask.setWInventoryTransactionOrdersId(orderId);
@@ -291,7 +292,7 @@ public class OrderServiceImpl extends BaseServiceImpl implements OrderService {
                 vo.setStorageLocationCode(policyOutResults.get(0).getStorageLocationCode());
                 vo.setOutPalletCode(policyOutResults.get(0).getPalletCode());
                 //库存数量
-                vo.setAmount(policyOutResults.get(0).getAmount());
+                vo.setStoreAmount(policyOutResults.get(0).getAmount());
             }
 
         });

src/main/java/com/imcs/admin/business/service/impl/WInventoryTransactionTaskServiceImpl.java

@@ -1,16 +1,14 @@
 package com.imcs.admin.business.service.impl;
 
 import cn.hutool.core.date.DateUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.imcs.admin.business.constants.Status;
 import com.imcs.admin.business.service.WInventoryTransactionTaskService;
 import com.imcs.admin.common.Result;
 import com.imcs.admin.common.constants.Constants;
-import com.imcs.admin.entity.Dic;
-import com.imcs.admin.entity.WInventoryTransactionChildTask;
-import com.imcs.admin.entity.WInventoryTransactionTask;
-import com.imcs.admin.entity.WInventoryTransactionTaskDetail;
+import com.imcs.admin.entity.*;
 import com.imcs.admin.entity.assemble.PolicyInputResult;
 import com.imcs.admin.entity.query.PolicyInputQuery;
 import org.springframework.stereotype.Service;
@@ -69,15 +67,17 @@ public class WInventoryTransactionTaskServiceImpl extends BaseServiceImpl implem
     public WInventoryTransactionTask insert(WInventoryTransactionTask wInventoryTransactionTask) {
         //this.taskDao.insert(wInventoryTransactionTask);
         //获取大小托盘类型
-        Dic entryPointPalletType = dicDao.getListByLabel("entryPointPalletType", wInventoryTransactionTask.getStartPosition());
-
-        PolicyInputQuery policyQuery = createPolicyQuery(Integer.valueOf(entryPointPalletType.getValue()),null);
+        //Dic entryPointPalletType = dicDao.getListByLabel("entryPointPalletType", wInventoryTransactionTask.getStartPosition());
+        LambdaQueryWrapper lambdaQueryWrapper=new LambdaQueryWrapper<>(WPalletManagement.class).eq(WPalletManagement::getPalletCode,wInventoryTransactionTask.getVectorCode());
+        WPalletManagement wPalletManagement = wPalletManagementDao.selectOne(lambdaQueryWrapper);
+        PolicyInputQuery policyQuery = createPolicyQuery(wPalletManagement.getPalletType(),null);
         Result importPolicy = importOrExportPolicyService.findImportPolicy(policyQuery);
         if(importPolicy.getData() == null){
             throw new RuntimeException("无可用库位，请联系管理员！");
         }
         PolicyInputResult policyResult = (PolicyInputResult)importPolicy.getData();
         String locationCode = policyResult.getLocationCode();
+        wInventoryTransactionTask.setEntryPoint(wInventoryTransactionTask.getStartPosition());
         wInventoryTransactionTask.setEndPosition(locationCode);
         wInventoryTransactionTask.setTaskCode(generateSerial.generateSerialNumber("outTask"));
         wInventoryTransactionTask.setCreatedAt(new Date());

src/main/java/com/imcs/admin/business/service/impl/WPInventoryCountPalletServiceImpl.java

@@ -142,6 +142,7 @@ public class WPInventoryCountPalletServiceImpl extends BaseServiceImpl implement
         wInventoryTransactionTask.setTaskCode(generateSerial.generateSerialNumber("inTask"));
         wInventoryTransactionTask.setStartPosition(wPInventoryCountPallet.getEntryPoint());
         wInventoryTransactionTask.setEndPosition(locationCode);
+        wInventoryTransactionTask.setEntryPoint(wPInventoryCountPallet.getEntryPoint());
         wInventoryTransactionTask.setVectorCode(wPInventoryCountPallet.getPalletCode());
         wInventoryTransactionTask.setStatus(0);
         wInventoryTransactionTask.setTaskType(2);

src/main/java/com/imcs/admin/business/service/impl/WStorageLocationManagementServiceImpl.java

@@ -71,6 +71,7 @@ public class WStorageLocationManagementServiceImpl extends BaseServiceImpl imple
         wInventoryTransactionTask.setStartPosition(startPosition);
 
         wInventoryTransactionTask.setEndPosition(endPosition);
+        wInventoryTransactionTask.setEntryPoint(endPosition);
         wInventoryTransactionTask.setVectorCode(palletCode);
         wInventoryTransactionTask.setStatus(0);
         wInventoryTransactionTask.setTaskType(1);

src/main/java/com/imcs/admin/entity/WInventoryTransactionOrdersDetail.java

@@ -99,5 +99,8 @@ public class WInventoryTransactionOrdersDetail implements Serializable {
     @TableField(exist = false)
     private String storageLocationCode;
 
+    @TableField(exist = false)
+    private Integer storeAmount;//库存数量
+
 }
 

src/main/java/com/imcs/admin/entity/WInventoryTransactionTask.java

@@ -87,6 +87,10 @@ public class WInventoryTransactionTask extends PageSize implements Serializable
      */
     private Long updatedBy;
     private Long wPInventoryCountTaskId;
+    /**
+     * 任务运行的出入库口
+     */
+    private String entryPoint;
 
     @TableField(exist = false)
     private List<WInventoryTransactionTaskDetail> detailList;

src/main/resources/static/wms/in/edit.html

@@ -25,7 +25,7 @@
                 </el-select>
             </el-form-item>
             <el-form-item label="入库类型">
-                <el-select v-model="detailType" placeholder="请选择">
+                <el-select v-model="detailType" placeholder="请选择" :disabled="true">
                     <el-option
                             v-for="item in detailTypeOptions"
                             :key="item.value"
@@ -64,7 +64,7 @@
                 <el-table-column prop="planAmount" label="计划入库数量" :show-overflow-tooltip="true"></el-table-column>
                 <el-table-column prop="amount" label="本次入库数量" :show-overflow-tooltip="true">
                     <template slot-scope="scope">
-                        <el-input v-model="scope.row.amount" type="number" @input="handleInput(scope.row)" :disabled="scope.row.status===2 "></el-input>
+                        <el-input v-model="scope.row.amount" type="number" @input="handleInput(scope.row)" :disabled="scope.row.status===2 || scope.row.planAmount==scope.row.realAmount"></el-input>
                     </template>
                 </el-table-column>
                 <el-table-column prop="realAmount" label="已入库数量" :show-overflow-tooltip="true"></el-table-column>
@@ -202,7 +202,7 @@
                             //TODO 这里还有问题  这里只考虑的托盘 没有考虑料盒
                             this.palletCode=res.vectorCode;
                             res.detailList.forEach(item=>{
-                                item.amount='';
+                                item.amount=null;
                                 this.addOutPalletCode(item.materialCode)
                             })
                             this.migrationResultList=res.detailList;
@@ -270,7 +270,19 @@
                         amount: 1,
                         realAmount: 0,
                     };
-                    if(this.migrationResultList.length === 0){
+
+                    this.migrationResultList.forEach(item => {
+                        console.log(item.aount)
+                        if (item.materialCode === code) {
+                            if(item.amount == null){
+                                item.amount=0;
+                            }
+                            item.amount=parseInt(item.amount)+1;
+                        }
+                    });
+
+
+                    /*if(this.migrationResultList.length === 0){
                         // Push the new row to migrationResultList
                         this.migrationResultList.push(newRow);
                         this.addOutPalletCode(code);
@@ -287,7 +299,7 @@
                             this.migrationResultList.push(newRow);
                             this.addOutPalletCode(code);
                         }
-                    }
+                    }*/
                 }else if(verify === 1){
                     this.palletCode=code;
                 }else if(verify === 2){
@@ -437,6 +449,10 @@
                     "detailList":this.selection
                 }).then(response => {
                     if(response.data.success){
+                        this.$message({
+                            message: '入库成功',
+                            type: "success"
+                        })
                         //window.location.href = "index.html";
                         this.locationList=[];
                         this.locationList=[];

src/main/resources/static/wms/out/index.html

@@ -209,7 +209,7 @@
                                         </el-select>
                                     </template>
                                 </el-table-column>
-                                <el-table-column prop="amount" label="库存数量" :show-overflow-tooltip="true"></el-table-column>
+                                <el-table-column prop="storeAmount" label="库存数量" :show-overflow-tooltip="true"></el-table-column>
                                 <el-table-column label="操作">
                                     <template #default="scope">
                                         <!-- 这里放置操作按钮 -->
@@ -647,6 +647,11 @@
                             if (response.data.success) {
                                 const res = response.data.data;
                                 this.detailListPallet = res;
+                                this.detailListPallet.forEach(ite=>{
+                                    if(ite.materialCode == row.materialCode){
+                                        row.storeAmount=ite.amount;
+                                    }
+                                })
                             }
                         })
                         .catch(error => {

src/main/resources/static/wms/task/index.html

@@ -20,7 +20,7 @@
                         <el-input v-model="formInline.orderCode" placeholder="入库单编号"></el-input>
                     </el-form-item>
                     <el-form-item label="出入库类型">
-                        <el-select v-model="formInline.taskType" placeholder="请选择">
+                        <el-select v-model="formInline.taskType" placeholder="请选择" :clearable="true">
                             <el-option
                                     v-for="item in taskTypeOptions"
                                     :key="item.value"
@@ -66,7 +66,7 @@
                     <template #default="scope">
                         <!-- 这里放置操作按钮 -->
                         <div class="button-group">
-                            <el-button type="primary" @click="getList(scope.row)" icon="el-icon-edit" circle>子任务</el-button>
+                            <el-button type="primary" @click="getList(scope.row)" icon="el-icon-edit">子任务</el-button>
                         </div>
                     </template>
                 </el-table-column>