理货分拣更新出库单明细状态和数量

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

@@ -194,8 +194,8 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="是否有货" prop="isEmpty">
-          <el-select v-model="form.isEmpty" placeholder="请选择是否有货">
+        <el-form-item label="是否无货" prop="isEmpty">
+          <el-select v-model="form.isEmpty" placeholder="请选择是否无货">
             <el-option
               v-for="dict in dict.type.sys_yes_no"
               :key="dict.value"

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

@@ -387,7 +387,7 @@ public class WmsDocOrderHeaderServiceImpl implements IWmsDocOrderHeaderService {
             invLotLocIdService.stockTransfer(actAllocationDetails.getLocationId(),"", Long.parseLong(locationTo));
             //托盘进行绑定修改
             wmsBoxInfoMapper.updateLocationBind(Long.parseLong(location), Long.parseLong(locationTo), null);
-            if (!exitsMap.containsKey(location)) {
+            /*if (!exitsMap.containsKey(location)) {
                 exitsMap.put(location, location);
                 //生成任务退回
                 FlowConfigHeaderVO flowConfigHeader = flowConfigHeaderService.selectFlowConfigHeaderById(4L);
@@ -401,7 +401,7 @@ public class WmsDocOrderHeaderServiceImpl implements IWmsDocOrderHeaderService {
                 if ((int) result.get(AjaxResult.CODE_TAG) == 500) {
                     throw new ServiceException("任务生成失败");
                 }
-            }
+            }*/
         }
         return AjaxResult.success("操作成功");
     }
@@ -535,7 +535,7 @@ public class WmsDocOrderHeaderServiceImpl implements IWmsDocOrderHeaderService {
         for (ActAllocationDetails actAllocationDetails : actAllocationDetailsList) {
             //把拣货库位上的库存移动到一个新的托盘上
             actAllocationDetails.setPickToLocation(boxTo.getLocationId().toString());
-            actAllocationDetails.setPickQty(new BigDecimal(arrangeStockForm.getQty()));
+            actAllocationDetails.setPickQty(actAllocationDetails.getPickQty().add(new BigDecimal(arrangeStockForm.getQty())));
             actAllocationDetails.setStatus("40");
             actAllocationDetailsService.updateActAllocationDetails(actAllocationDetails);
             //修改托盘状态
@@ -544,6 +544,17 @@ public class WmsDocOrderHeaderServiceImpl implements IWmsDocOrderHeaderService {
             //库存进行移动
             invLotLocIdService.stockTransferPick(actAllocationDetails.getLocationId(), boxTo.getLocationId(), actAllocationDetails.getLotnum(), new BigDecimal(arrangeStockForm.getQty()), arrangeStockForm.getBoxNo());
 
+            //更新出库单拣货数量
+            WmsDocOrderDetails wmsDocOrderDetails = wmsDocOrderDetailsMapper.selectWmsDocOrderDetailsByNoLineNo(actAllocationDetails.getOrderNo(), actAllocationDetails.getLineNo());
+            wmsDocOrderDetails.setQtyPicked(wmsDocOrderDetails.getQtyPicked().add(actAllocationDetails.getPickQty()));
+            wmsDocOrderDetails.setQtyPickedEach(wmsDocOrderDetails.getQtyPicked());
+            if (actAllocationDetails.getQty().compareTo(actAllocationDetails.getPickQty()) == 1) {
+                wmsDocOrderDetails.setLineStatus("30");
+            } else {
+                wmsDocOrderDetails.setLineStatus("40");
+            }
+            wmsDocOrderDetailsMapper.updateWmsDocOrderDetails(wmsDocOrderDetails);
+
             //记录事务日志
             //记录日志
             ActTransactionLog actTransactionLog = new ActTransactionLog();

warewms-ams/src/main/resources/mapper/docOrder/ActAllocationDetailsMapper.xml

@@ -168,8 +168,7 @@
     <select id="queryAllocationDetailsByPalletNo" parameterType="String" resultMap="ActAllocationDetailsResult">
         select al.*
         from act_allocation_details al
-                 left join wms_box_info b on al.location_id = b.location_id
-        where b.box_no = #{palletNo}
+        where al.userdefine1 = #{palletNo}
     </select>
 
     <select id="queryAllocationDetailsByOrderNo" parameterType="String" resultMap="ActAllocationDetailsResult">