测试bug

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warewms/ams/WcsTaskController.java

@@ -124,7 +124,7 @@ public class WcsTaskController extends BaseController {
             agvNo = Integer.parseInt(wcsTask.getAgvNo());
         }
         AjaxResult ajaxResult = wcsTaskService.callBack(wcsTask.getTaskNo(), 4, agvNo);
-        return AjaxResult.error(ajaxResult.getMsg());
+        return ajaxResult;
     }
 
     @Log(title = "卸货任务完成", businessType = BusinessType.INSERT)
@@ -139,7 +139,7 @@ public class WcsTaskController extends BaseController {
             agvNo = Integer.parseInt(wcsTask.getAgvNo());
         }
         AjaxResult ajaxResult = wcsTaskService.callBack(wcsTask.getTaskNo(),2,agvNo);
-        return AjaxResult.error(ajaxResult.getMsg());
+        return ajaxResult;
     }
 
     @Log(title = "任务取消", businessType = BusinessType.INSERT)

ruoyi-ui/src/views/ams/task/index.vue

@@ -771,33 +771,34 @@ export default {
       }, `wcsTask_${new Date().getTime()}.xlsx`)
     },
     handlePickupCompleted (row) {
-      let that = this
       const taskNos = row.taskNo
+      let vue = this
       this.$modal.confirm('是否确认取货完成"' + taskNos + '"的任务？').then(function() {
-       pickupCompleteWcsTask(taskNos).then(response => {
-         if (response.code === 200) {
-           this.getList();
-           that.$modal.msgSuccess(response.msg);
-         } else {
-           that.getList();
-           that.$modal.msgError(response.msg);
-         }
-       });
+        pickupCompleteWcsTask(taskNos).then(response => {
+          console.log(response)
+          if (response.code == 200) {
+            vue.getList();
+            vue.$modal.msgSuccess(response.msg);
+          } else {
+            vue.getList();
+            vue.$modal.msgError(response.msg);
+          }
+        });
       });
     },
     handleComplete (row) {
-      let that = this
       const taskNos = row.taskNo
+      const vue = this
       this.$modal.confirm('是否确认卸货完成"' + taskNos + '"的任务？').then(function() {
-       completeWcsTask(taskNos).then(response => {
-         if (response.code === 200) {
-           this.getList();
-           that.$modal.msgSuccess(response.msg);
-         } else {
-           this.getList();
-           that.$modal.msgError(response.msg);
-         }
-       });
+        completeWcsTask(taskNos).then(response => {
+          if (response.code === 200) {
+            vue.getList();
+            vue.$modal.msgSuccess(response.msg);
+          } else {
+            vue.getList();
+            vue.$modal.msgError(response.msg);
+          }
+        });
       });
     },
     handleCancel (row) {

ruoyi-ui/src/views/wms/barcodes/index.vue

@@ -122,12 +122,13 @@
 <!--           v-hasPermi="['system:skuinv:export']"-->
 <!--         >导出</el-button>-->
 <!--       </el-col>-->
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
+<!--      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>-->
+<!--    </el-row>-->
 
     <el-table v-loading="loading" :data="barcodesList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="ID" align="center" prop="id" />
+<!--      <el-table-column label="ID" align="center" prop="id" />-->
+      <el-table-column label="叉车单号" align="center" prop="userdefine4" />
       <el-table-column label="条码号" align="center" prop="barcode" />
       <el-table-column label="仓库id" align="center" prop="stockId" />
       <el-table-column label="货架编号" align="center" prop="locationNo" />
@@ -137,7 +138,10 @@
       <el-table-column label="入库/出库" align="center" prop="type" />
       <el-table-column label="erp单号" align="center" prop="erpNo" />
       <el-table-column label="项次" align="center" prop="erpName" />
-      <el-table-column label="erp单据类型" align="center" prop="erpType" />
+      <el-table-column label="人员" align="center" prop="userdefine3" />
+      <el-table-column label="时间" align="center" prop="userdefine2" />
+      <el-table-column label="状态（扫描记录是否有效）" align="center" prop="userdefine1" />
+      <el-table-column label="回传标识" align="center" prop="userdefine8" />
 <!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
 <!--        <template slot-scope="scope">-->
 <!--          <el-button-->
@@ -157,7 +161,7 @@
 <!--        </template>-->
 <!--      </el-table-column>-->
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"

warewms-ams/src/main/java/com/ruoyi/ams/order/service/impl/WmsDocOrderHeaderServiceImpl.java

@@ -1466,6 +1466,7 @@ public class WmsDocOrderHeaderServiceImpl implements IWmsDocOrderHeaderService {
         boolean isAllUpdate = false; // 库存转移类型，是全部修改，还是拆分
         boolean isStockPalletNoTo = groupDiskFrom.isStockPalletNoTo(); // 目标托盘是否是备货托盘，为了方便，目标托盘默认是备货托盘
         final Double toQty;
+        boolean isAllocation = false; // 扫描条码对应库存是否被其他备货单分配
         Long currentVirtualZone; // 当前所在的虚拟区
         if (StringUtils.isNotEmpty(groupDiskFrom.getOrderNo())) {
             orderNo = groupDiskFrom.getOrderNo();
@@ -1507,6 +1508,10 @@ public class WmsDocOrderHeaderServiceImpl implements IWmsDocOrderHeaderService {
         if (endLotattVO == null) {
             return AjaxResult.error("组盘数量大于单条库存数量！");
         }
+        // 判断扫描条码的库存是否被分配
+        if (endLotattVO.getQtyallocated().compareTo(BigDecimal.ONE.doubleValue()) == 0) {
+            isAllocation = true;
+        }
         currentVirtualZone = endLotattVO.getLocationId();
         invLotLocIdLotattVOList.add(endLotattVO);
         // 验证备货库存是否已经备货
@@ -1549,12 +1554,36 @@ public class WmsDocOrderHeaderServiceImpl implements IWmsDocOrderHeaderService {
             if (invLotAttMapper.insertInvLotAtt(invLotAtt) > 0) {
                 for (InvLotLocIdLotattVO v : invLocIdList) {
                     if (isAllUpdate) {
+                        // 如果扫描的条码未分配
+                        if (!isAllocation) {
+                            // 修改原本出库单对应的任意一个条码分配数为1
+                            InvLocIdSearchFrom locIdSearchFrom01 = new InvLocIdSearchFrom();
+                            LotattDTO lotattDTO01 = new LotattDTO();
+                            lotattDTO01.setLotatt07(palletNoFrom);
+                            lotattDTO01.setLotatt15(orderNo);
+                            locIdSearchFrom01.setLotattDTO(lotattDTO01);
+                            List<InvLotLocIdLotattVO> invLotLocIdLotattList01 = invLotLocIdService.selectInvLocIdLotattList(locIdSearchFrom01);
+                            for (InvLotLocIdLotattVO locIdLotattVO : invLotLocIdLotattList01) {
+                                // 没有备货并且分配数为1
+                                if (StringUtils.isEmpty(locIdLotattVO.getLotatt14())
+                                        && locIdLotattVO.getQtyallocated().compareTo(BigDecimal.ONE.doubleValue()) == 0) {
+                                    InvLotLocIdForm invLotLocIdUpdate = new InvLotLocIdForm();
+                                    invLotLocIdUpdate.setLotnum(locIdLotattVO.getLotnum());
+                                    invLotLocIdUpdate.setLocationId(locIdLotattVO.getLocationId().toString());
+                                    invLotLocIdUpdate.setCustomerId(locIdLotattVO.getCustomerId());
+                                    invLotLocIdUpdate.setSku(locIdLotattVO.getSku());
+                                    invLotLocIdUpdate.setQtyallocated(BigDecimal.ZERO);
+                                    invLotLocIdService.updateInvLotLocId(invLotLocIdUpdate);
+                                }
+                            }
+
+                        }
                         InvLotLocIdForm invLotLocIdUpdate = new InvLotLocIdForm();
                         invLotLocIdUpdate.setLotnum(lotnum);
                         invLotLocIdUpdate.setLocationId(v.getLocationId().toString());
                         invLotLocIdUpdate.setCustomerId(v.getCustomerId());
                         invLotLocIdUpdate.setSku(v.getSku());
-                        invLotLocIdUpdate.setQtyallocated(invLotLocIdUpdate.getQty());
+                        invLotLocIdUpdate.setQtyallocated(BigDecimal.ONE);
                         invLotLocIdUpdate.setLotnumTo(newLotnum);
                         invLotLocIdService.updateInvLotLocId(invLotLocIdUpdate);
                     }
@@ -1863,7 +1892,7 @@ public class WmsDocOrderHeaderServiceImpl implements IWmsDocOrderHeaderService {
         InvLocIdSearchFrom invLocIdSearchFrom = new InvLocIdSearchFrom();
         LotattDTO lotattDTO = new LotattDTO();
         lotattDTO.setLotatt07(snCheckSoForm.getPalletNo());
-        lotattDTO.setLotatt15(snCheckSoForm.getOrderNo());
+//        lotattDTO.setLotatt15(snCheckSoForm.getOrderNo());
         lotattDTO.setLotatt02(snCheckSoForm.getSn());
         invLocIdSearchFrom.setLotattDTO(lotattDTO);
         List<InvLotLocIdLotattVO> invLotLocIdLotattVOList = invLotLocIdService.selectInvLocIdLotattList(invLocIdSearchFrom);
@@ -1953,6 +1982,8 @@ public class WmsDocOrderHeaderServiceImpl implements IWmsDocOrderHeaderService {
                 details.setdEdi07(erpOrderNo);    //项次
                 details.setdEdi08(erpOrder.getOrderType());     //erp单据类型
                 details.setdEdi09(erpOrder.getInout());         //erp出入库类型
+                details.setdEdi10(erpOrder.getCreateDate());    //创建时间
+                details.setdEdi11(erpOrder.getCreateUser());    //人员
                 details.setLineStatus("00");
                 details.setCreateTime(new Date());
                 details.setCreateBy(erpOrder.getCreateUser());