出库分拣，条码品号关系表

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warewms/base/CodeSkuRelationshipController.java

@@ -0,0 +1,104 @@
+package com.ruoyi.web.controller.warewms.base;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.base.domain.CodeSkuRelationship;
+import com.ruoyi.base.service.ICodeSkuRelationshipService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 条码品号关系表Controller
+ * 
+ * @author andy
+ * @date 2022-11-07
+ */
+@RestController
+@RequestMapping("/snRelationship/relationship")
+public class CodeSkuRelationshipController extends BaseController
+{
+    @Autowired
+    private ICodeSkuRelationshipService codeSkuRelationshipService;
+
+    /**
+     * 查询条码品号关系表列表
+     */
+    @PreAuthorize("@ss.hasPermi('snRelationship:relationship:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(CodeSkuRelationship codeSkuRelationship)
+    {
+        startPage();
+        List<CodeSkuRelationship> list = codeSkuRelationshipService.selectCodeSkuRelationshipList(codeSkuRelationship);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出条码品号关系表列表
+     */
+    @PreAuthorize("@ss.hasPermi('snRelationship:relationship:export')")
+    @Log(title = "条码品号关系表", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, CodeSkuRelationship codeSkuRelationship)
+    {
+        List<CodeSkuRelationship> list = codeSkuRelationshipService.selectCodeSkuRelationshipList(codeSkuRelationship);
+        ExcelUtil<CodeSkuRelationship> util = new ExcelUtil<CodeSkuRelationship>(CodeSkuRelationship.class);
+        util.exportExcel(response, list, "条码品号关系表数据");
+    }
+
+    /**
+     * 获取条码品号关系表详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('snRelationship:relationship:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(codeSkuRelationshipService.selectCodeSkuRelationshipById(id));
+    }
+
+    /**
+     * 新增条码品号关系表
+     */
+    @PreAuthorize("@ss.hasPermi('snRelationship:relationship:add')")
+    @Log(title = "条码品号关系表", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody CodeSkuRelationship codeSkuRelationship)
+    {
+        return toAjax(codeSkuRelationshipService.insertCodeSkuRelationship(codeSkuRelationship));
+    }
+
+    /**
+     * 修改条码品号关系表
+     */
+    @PreAuthorize("@ss.hasPermi('snRelationship:relationship:edit')")
+    @Log(title = "条码品号关系表", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody CodeSkuRelationship codeSkuRelationship)
+    {
+        return toAjax(codeSkuRelationshipService.updateCodeSkuRelationship(codeSkuRelationship));
+    }
+
+    /**
+     * 删除条码品号关系表
+     */
+    @PreAuthorize("@ss.hasPermi('snRelationship:relationship:remove')")
+    @Log(title = "条码品号关系表", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(codeSkuRelationshipService.deleteCodeSkuRelationshipByIds(ids));
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warewms/wms/order/ActAllocationDetailsController.java

@@ -101,4 +101,6 @@ public class ActAllocationDetailsController extends BaseController
     {
         return toAjax(actAllocationDetailsService.deleteActAllocationDetailsByAllocationIds(allocationIds));
     }
+
+
 }

ruoyi-ui/src/api/base/relationship.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询条码品号关系表列表
+export function listRelationship(query) {
+  return request({
+    url: '/snRelationship/relationship/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询条码品号关系表详细
+export function getRelationship(id) {
+  return request({
+    url: '/snRelationship/relationship/' + id,
+    method: 'get'
+  })
+}
+
+// 新增条码品号关系表
+export function addRelationship(data) {
+  return request({
+    url: '/snRelationship/relationship',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改条码品号关系表
+export function updateRelationship(data) {
+  return request({
+    url: '/snRelationship/relationship',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除条码品号关系表
+export function delRelationship(id) {
+  return request({
+    url: '/snRelationship/relationship/' + id,
+    method: 'delete'
+  })
+}

ruoyi-ui/src/views/base/relationship/index.vue

@@ -0,0 +1,331 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="条码" prop="sn">
+        <el-input
+          v-model="queryParams.sn"
+          placeholder="请输入条码"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="有效否" prop="status">
+        <el-select v-model="queryParams.status" placeholder="请选择有效否" clearable size="small">
+          <el-option
+            v-for="dict in dict.type.sys_yes_no"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="物料" prop="sku">
+        <el-input
+          v-model="queryParams.sku"
+          placeholder="请输入物料"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="日期" prop="vdate">
+        <el-date-picker clearable size="small"
+          v-model="queryParams.vdate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="人员" prop="userId">
+        <el-input
+          v-model="queryParams.userId"
+          placeholder="请输入人员"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['snRelationship:relationship:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['snRelationship:relationship:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['snRelationship:relationship:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['snRelationship:relationship:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="relationshipList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="主键" align="center" prop="id" />
+      <el-table-column label="条码" align="center" prop="sn" />
+      <el-table-column label="有效否" align="center" prop="status">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.status"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="物料" align="center" prop="sku" />
+      <el-table-column label="日期" align="center" prop="vdate" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.vdate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="人员" align="center" prop="userId" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['snRelationship:relationship:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['snRelationship:relationship:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改条码品号关系表对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="条码" prop="sn">
+          <el-input v-model="form.sn" placeholder="请输入条码" />
+        </el-form-item>
+        <el-form-item label="有效否" prop="status">
+          <el-select v-model="form.status" placeholder="请选择有效否">
+            <el-option
+              v-for="dict in dict.type.sys_yes_no"
+              :key="dict.value"
+              :label="dict.label"
+:value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="物料" prop="sku">
+          <el-input v-model="form.sku" placeholder="请输入物料" />
+        </el-form-item>
+        <el-form-item label="日期" prop="vdate">
+          <el-date-picker clearable size="small"
+            v-model="form.vdate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="人员" prop="userId">
+          <el-input v-model="form.userId" placeholder="请输入人员" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listRelationship, getRelationship, delRelationship, addRelationship, updateRelationship } from "@/api/base/relationship";
+
+export default {
+  name: "Relationship",
+  dicts: ['sys_yes_no'],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 条码品号关系表表格数据
+      relationshipList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        sn: null,
+        status: null,
+        sku: null,
+        vdate: null,
+        userId: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询条码品号关系表列表 */
+    getList() {
+      this.loading = true;
+      listRelationship(this.queryParams).then(response => {
+        this.relationshipList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        sn: null,
+        status: null,
+        sku: null,
+        vdate: null,
+        userId: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加条码品号关系表";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getRelationship(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改条码品号关系表";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateRelationship(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addRelationship(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除条码品号关系表编号为"' + ids + '"的数据项？').then(function() {
+        return delRelationship(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('snRelationship/relationship/export', {
+        ...this.queryParams
+      }, `relationship_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

warewms-ams/src/main/java/com/ruoyi/ams/box/mapper/WmsBoxInfoMapper.java

@@ -2,18 +2,19 @@ package com.ruoyi.ams.box.mapper;
 
 import java.util.List;
 import com.ruoyi.ams.box.domain.WmsBoxInfo;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 容器管理Mapper接口
- * 
+ *
  * @author ruoyi
  * @date 2022-11-01
  */
-public interface WmsBoxInfoMapper 
+public interface WmsBoxInfoMapper
 {
     /**
      * 查询容器管理
-     * 
+     *
      * @param id 容器管理主键
      * @return 容器管理
      */
@@ -21,7 +22,7 @@ public interface WmsBoxInfoMapper
 
     /**
      * 查询容器管理列表
-     * 
+     *
      * @param wmsBoxInfo 容器管理
      * @return 容器管理集合
      */
@@ -29,7 +30,7 @@ public interface WmsBoxInfoMapper
 
     /**
      * 新增容器管理
-     * 
+     *
      * @param wmsBoxInfo 容器管理
      * @return 结果
      */
@@ -37,7 +38,7 @@ public interface WmsBoxInfoMapper
 
     /**
      * 修改容器管理
-     * 
+     *
      * @param wmsBoxInfo 容器管理
      * @return 结果
      */
@@ -45,7 +46,7 @@ public interface WmsBoxInfoMapper
 
     /**
      * 删除容器管理
-     * 
+     *
      * @param id 容器管理主键
      * @return 结果
      */
@@ -53,9 +54,18 @@ public interface WmsBoxInfoMapper
 
     /**
      * 批量删除容器管理
-     * 
+     *
      * @param ids 需要删除的数据主键集合
      * @return 结果
      */
      int deleteWmsBoxInfoByIds(Long[] ids);
+
+    /**
+     * 更新托盘库位绑定位置
+     * @param locationFrom 起始位置
+     * @param locationTo 目标位置
+     * @param isFull 是否满托
+     * @return
+     */
+     int updateLocationBind(@Param("locationFrom") Long locationFrom,@Param("locationTo") Long locationTo,@Param("isFull") String isFull);
 }

warewms-ams/src/main/java/com/ruoyi/ams/order/form/CheckOutForm.java

@@ -0,0 +1,17 @@
+package com.ruoyi.ams.order.form;
+
+import lombok.Data;
+
+/**
+ * Created by IntelliJ IDEA.
+ * User: andy.qu
+ * Date: 2022/11/7
+ * Description:
+ */
+@Data
+public class CheckOutForm {
+    private String orderNo;
+    private Long orderLineNo;
+    private Long actAllocationId;
+    private String locationTo;
+}

warewms-ams/src/main/java/com/ruoyi/ams/order/form/PickForm.java

@@ -2,8 +2,6 @@ package com.ruoyi.ams.order.form;
 
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * Created by IntelliJ IDEA.
  * User: andy.qu
@@ -12,6 +10,13 @@ import java.util.List;
  */
 @Data
 public class PickForm {
+    private String allocationId;
+    private String orderNo;
     private String palletNo;
-    private List<PickInfoForm> pickInfoList;
+    private String boxNo;
+    private String sn;
+    private String sku;
+    private String qty;
+    private String locationTo;
+    private String fullTag;
 }

warewms-ams/src/main/java/com/ruoyi/ams/order/mapper/WmsDocOrderDetailsMapper.java

@@ -2,6 +2,7 @@ package com.ruoyi.ams.order.mapper;
 
 import java.util.List;
 import com.ruoyi.ams.order.domain.WmsDocOrderDetails;
+import com.ruoyi.ams.order.vo.StockOrderVO;
 import org.apache.ibatis.annotations.Param;
 
 /**
@@ -69,4 +70,11 @@ public interface WmsDocOrderDetailsMapper
      * @return
      */
     int updateOrderDetailsStock(@Param("orderNo") String orderNo, @Param("orderLoneNo") Long orderLoneNo, @Param("sku") String sku, @Param("qty") Double qty);
+
+    /**
+     * 查询待出库记录
+     * @param palletNo 托盘编号
+     * @return
+     */
+    List<StockOrderVO> selectStockOrder(@Param("palletNo") String palletNo);
 }

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

@@ -4,7 +4,9 @@ import java.util.List;
 
 import com.ruoyi.ams.order.domain.WmsDocOrderDetails;
 import com.ruoyi.ams.order.domain.WmsDocOrderHeader;
+import com.ruoyi.ams.order.form.CheckOutForm;
 import com.ruoyi.ams.order.form.PickForm;
+import com.ruoyi.ams.order.vo.StockOrderVO;
 import com.ruoyi.common.core.domain.AjaxResult;
 
 /**
@@ -115,8 +117,21 @@ public interface IWmsDocOrderHeaderService {
 
     /**
      * 拣货分拣
-     * @param pickForm
+     * @param pickFormList
      * @return
      */
-    AjaxResult doPick(PickForm pickForm);
+    AjaxResult doPick(List<PickForm> pickFormList);
+
+    /**
+     * 分拣出库
+     * @return
+     */
+    AjaxResult doCheckout(List<CheckOutForm> checkOutForms);
+
+    /**
+     * 查询待出库明细
+     * @param palletNo
+     * @return
+     */
+    List<StockOrderVO> selectStockOrder(String palletNo);
 }

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

@@ -3,13 +3,16 @@ package com.ruoyi.ams.order.service.impl;
 import java.math.BigDecimal;
 import java.util.List;
 
+import com.ruoyi.ams.box.mapper.WmsBoxInfoMapper;
 import com.ruoyi.ams.inv.domain.InvLotLocId;
 import com.ruoyi.ams.inv.service.IInvLotLocIdService;
 import com.ruoyi.ams.order.domain.ActAllocationDetails;
 import com.ruoyi.ams.order.domain.WmsDocOrderDetails;
+import com.ruoyi.ams.order.form.CheckOutForm;
 import com.ruoyi.ams.order.form.PickForm;
 import com.ruoyi.ams.order.mapper.WmsDocOrderDetailsMapper;
 import com.ruoyi.ams.order.service.IActAllocationDetailsService;
+import com.ruoyi.ams.order.vo.StockOrderVO;
 import com.ruoyi.common.core.domain.AjaxResult;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -36,6 +39,8 @@ public class WmsDocOrderHeaderServiceImpl implements IWmsDocOrderHeaderService {
     private IActAllocationDetailsService actAllocationDetailsService;
     @Autowired
     private IWmsDocOrderHeaderService wmsDocOrderHeaderService;
+    @Autowired
+    private WmsBoxInfoMapper wmsBoxInfoMapper;
 
     /**
      * 查询出库单头
@@ -251,7 +256,32 @@ public class WmsDocOrderHeaderServiceImpl implements IWmsDocOrderHeaderService {
     }
 
     @Override
-    public AjaxResult doPick(PickForm pickForm) {
+    public AjaxResult doPick(List<PickForm> pickFormList) {
+        for (PickForm p : pickFormList) {
+            //查询对应的分配明细表
+            ActAllocationDetails actAllocationDetails = actAllocationDetailsService.selectActAllocationDetailsByAllocationId(p.getAllocationId());
+            actAllocationDetails.setPickQty(actAllocationDetails.getPickQty().add(new BigDecimal(p.getQty())));
+            actAllocationDetails.setPickToLocation(p.getLocationTo());
+            actAllocationDetailsService.updateActAllocationDetails(actAllocationDetails);
+
+            //库存进行移动
+            invLotLocIdService.stockTransfer(actAllocationDetails.getLocationId(), Long.parseLong(actAllocationDetails.getPickToLocation()));
+            //托盘进行绑定修改
+            wmsBoxInfoMapper.updateLocationBind(actAllocationDetails.getLocationId(), Long.parseLong(p.getLocationTo()),p.getFullTag());
+            //TODO 是否需要生成任务
+        }
+        return AjaxResult.success("操作成功");
+    }
+
+    @Override
+    public AjaxResult doCheckout(List<CheckOutForm> checkOutForms) {
+
+        return null;
+    }
+
+    @Override
+    public List<StockOrderVO> selectStockOrder(String palletNo) {
+
         return null;
     }
 }

warewms-ams/src/main/java/com/ruoyi/ams/order/vo/StockOrderVO.java

@@ -0,0 +1,20 @@
+package com.ruoyi.ams.order.vo;
+
+import lombok.Data;
+
+/**
+ * 备货出库查询
+ * Created by IntelliJ IDEA.
+ * User: andy.qu
+ * Date: 2022/11/7
+ * Description:
+ */
+@Data
+public class StockOrderVO {
+    private String orderNo;
+    private Long orderLineNo;
+    private String allocationId;
+    private String sku;
+    private String sn;
+    private String pickQty;
+}

warewms-ams/src/main/resources/mapper/box/WmsBoxInfoMapper.xml

@@ -101,4 +101,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </delete>
+
+    <update id="updateLocationBind">
+        update wms_box_info
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="locationId != null">location_id = #{locationTo},</if>
+            <if test="isFull != null">is_full = #{isFull},</if>
+        </trim>
+        where location_id = #{locationFrom}
+    </update>
 </mapper>

warewms-base/src/main/java/com/ruoyi/base/domain/CodeSkuRelationship.java

@@ -0,0 +1,114 @@
+package com.ruoyi.base.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 条码品号关系表对象 code_sku_relationship
+ * 
+ * @author andy
+ * @date 2022-11-07
+ */
+public class CodeSkuRelationship extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    private Long id;
+
+    /** 条码 */
+    @Excel(name = "条码")
+    private String sn;
+
+    /** 有效否 */
+    @Excel(name = "有效否")
+    private String status;
+
+    /** 物料 */
+    @Excel(name = "物料")
+    private String sku;
+
+    /** 日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date vdate;
+
+    /** 人员 */
+    @Excel(name = "人员")
+    private String userId;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setSn(String sn) 
+    {
+        this.sn = sn;
+    }
+
+    public String getSn() 
+    {
+        return sn;
+    }
+    public void setStatus(String status) 
+    {
+        this.status = status;
+    }
+
+    public String getStatus() 
+    {
+        return status;
+    }
+    public void setSku(String sku) 
+    {
+        this.sku = sku;
+    }
+
+    public String getSku() 
+    {
+        return sku;
+    }
+    public void setVdate(Date vdate) 
+    {
+        this.vdate = vdate;
+    }
+
+    public Date getVdate() 
+    {
+        return vdate;
+    }
+    public void setUserId(String userId) 
+    {
+        this.userId = userId;
+    }
+
+    public String getUserId() 
+    {
+        return userId;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("sn", getSn())
+            .append("status", getStatus())
+            .append("sku", getSku())
+            .append("vdate", getVdate())
+            .append("userId", getUserId())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .toString();
+    }
+}

warewms-base/src/main/java/com/ruoyi/base/mapper/CodeSkuRelationshipMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.base.mapper;
+
+import java.util.List;
+import com.ruoyi.base.domain.CodeSkuRelationship;
+
+/**
+ * 条码品号关系表Mapper接口
+ * 
+ * @author andy
+ * @date 2022-11-07
+ */
+public interface CodeSkuRelationshipMapper 
+{
+    /**
+     * 查询条码品号关系表
+     * 
+     * @param id 条码品号关系表主键
+     * @return 条码品号关系表
+     */
+     CodeSkuRelationship selectCodeSkuRelationshipById(Long id);
+
+    /**
+     * 查询条码品号关系表列表
+     * 
+     * @param codeSkuRelationship 条码品号关系表
+     * @return 条码品号关系表集合
+     */
+     List<CodeSkuRelationship> selectCodeSkuRelationshipList(CodeSkuRelationship codeSkuRelationship);
+
+    /**
+     * 新增条码品号关系表
+     * 
+     * @param codeSkuRelationship 条码品号关系表
+     * @return 结果
+     */
+     int insertCodeSkuRelationship(CodeSkuRelationship codeSkuRelationship);
+
+    /**
+     * 修改条码品号关系表
+     * 
+     * @param codeSkuRelationship 条码品号关系表
+     * @return 结果
+     */
+     int updateCodeSkuRelationship(CodeSkuRelationship codeSkuRelationship);
+
+    /**
+     * 删除条码品号关系表
+     * 
+     * @param id 条码品号关系表主键
+     * @return 结果
+     */
+     int deleteCodeSkuRelationshipById(Long id);
+
+    /**
+     * 批量删除条码品号关系表
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+     int deleteCodeSkuRelationshipByIds(Long[] ids);
+}

warewms-base/src/main/java/com/ruoyi/base/service/ICodeSkuRelationshipService.java

@@ -0,0 +1,69 @@
+package com.ruoyi.base.service;
+
+import java.util.List;
+import com.ruoyi.base.domain.CodeSkuRelationship;
+
+/**
+ * 条码品号关系表Service接口
+ * 
+ * @author andy
+ * @date 2022-11-07
+ */
+public interface ICodeSkuRelationshipService 
+{
+    /**
+     * 查询条码品号关系表
+     * 
+     * @param id 条码品号关系表主键
+     * @return 条码品号关系表
+     */
+     CodeSkuRelationship selectCodeSkuRelationshipById(Long id);
+
+    /**
+     * 查询条码品号关系表列表
+     * 
+     * @param codeSkuRelationship 条码品号关系表
+     * @return 条码品号关系表集合
+     */
+     List<CodeSkuRelationship> selectCodeSkuRelationshipList(CodeSkuRelationship codeSkuRelationship);
+
+    /**
+     * 查询条码品号关系表
+     *
+     * @param codeSkuRelationship 条码品号关系表
+     * @return 条码品号关系表集合
+     */
+    CodeSkuRelationship selectCodeSkuRelationshipByModel(CodeSkuRelationship codeSkuRelationship);
+
+    /**
+     * 新增条码品号关系表
+     * 
+     * @param codeSkuRelationship 条码品号关系表
+     * @return 结果
+     */
+     int insertCodeSkuRelationship(CodeSkuRelationship codeSkuRelationship);
+
+    /**
+     * 修改条码品号关系表
+     * 
+     * @param codeSkuRelationship 条码品号关系表
+     * @return 结果
+     */
+     int updateCodeSkuRelationship(CodeSkuRelationship codeSkuRelationship);
+
+    /**
+     * 批量删除条码品号关系表
+     * 
+     * @param ids 需要删除的条码品号关系表主键集合
+     * @return 结果
+     */
+     int deleteCodeSkuRelationshipByIds(Long[] ids);
+
+    /**
+     * 删除条码品号关系表信息
+     * 
+     * @param id 条码品号关系表主键
+     * @return 结果
+     */
+     int deleteCodeSkuRelationshipById(Long id);
+}

warewms-base/src/main/java/com/ruoyi/base/service/impl/CodeSkuRelationshipServiceImpl.java

@@ -0,0 +1,113 @@
+package com.ruoyi.base.service.impl;
+
+import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.base.mapper.CodeSkuRelationshipMapper;
+import com.ruoyi.base.domain.CodeSkuRelationship;
+import com.ruoyi.base.service.ICodeSkuRelationshipService;
+
+/**
+ * 条码品号关系表Service业务层处理
+ * 
+ * @author andy
+ * @date 2022-11-07
+ */
+@Service
+public class CodeSkuRelationshipServiceImpl implements ICodeSkuRelationshipService 
+{
+    @Autowired
+    private CodeSkuRelationshipMapper codeSkuRelationshipMapper;
+
+    /**
+     * 查询条码品号关系表
+     * 
+     * @param id 条码品号关系表主键
+     * @return 条码品号关系表
+     */
+    @Override
+    public CodeSkuRelationship selectCodeSkuRelationshipById(Long id)
+    {
+        return codeSkuRelationshipMapper.selectCodeSkuRelationshipById(id);
+    }
+
+    /**
+     * 查询条码品号关系表列表
+     * 
+     * @param codeSkuRelationship 条码品号关系表
+     * @return 条码品号关系表
+     */
+    @Override
+    public List<CodeSkuRelationship> selectCodeSkuRelationshipList(CodeSkuRelationship codeSkuRelationship)
+    {
+        return codeSkuRelationshipMapper.selectCodeSkuRelationshipList(codeSkuRelationship);
+    }
+
+    /**
+     * 查询条码品号关系表
+     *
+     * @param codeSkuRelationship 条码品号关系表
+     * @return 条码品号关系表
+     */
+    @Override
+    public CodeSkuRelationship selectCodeSkuRelationshipByModel(CodeSkuRelationship codeSkuRelationship)
+    {
+        List<CodeSkuRelationship> list = codeSkuRelationshipMapper.selectCodeSkuRelationshipList(codeSkuRelationship);
+        if (list!=null && list.size()>0) {
+            return list.get(0);
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * 新增条码品号关系表
+     * 
+     * @param codeSkuRelationship 条码品号关系表
+     * @return 结果
+     */
+    @Override
+    public int insertCodeSkuRelationship(CodeSkuRelationship codeSkuRelationship)
+    {
+        codeSkuRelationship.setCreateTime(DateUtils.getNowDate());
+        return codeSkuRelationshipMapper.insertCodeSkuRelationship(codeSkuRelationship);
+    }
+
+    /**
+     * 修改条码品号关系表
+     * 
+     * @param codeSkuRelationship 条码品号关系表
+     * @return 结果
+     */
+    @Override
+    public int updateCodeSkuRelationship(CodeSkuRelationship codeSkuRelationship)
+    {
+        codeSkuRelationship.setUpdateTime(DateUtils.getNowDate());
+        return codeSkuRelationshipMapper.updateCodeSkuRelationship(codeSkuRelationship);
+    }
+
+    /**
+     * 批量删除条码品号关系表
+     * 
+     * @param ids 需要删除的条码品号关系表主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCodeSkuRelationshipByIds(Long[] ids)
+    {
+        return codeSkuRelationshipMapper.deleteCodeSkuRelationshipByIds(ids);
+    }
+
+    /**
+     * 删除条码品号关系表信息
+     * 
+     * @param id 条码品号关系表主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCodeSkuRelationshipById(Long id)
+    {
+        return codeSkuRelationshipMapper.deleteCodeSkuRelationshipById(id);
+    }
+}

warewms-base/src/main/resources/mapper/base/CodeSkuRelationshipMapper.xml

@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.base.mapper.CodeSkuRelationshipMapper">
+    
+    <resultMap type="CodeSkuRelationship" id="CodeSkuRelationshipResult">
+        <result property="id"    column="id"    />
+        <result property="sn"    column="sn"    />
+        <result property="status"    column="status"    />
+        <result property="sku"    column="sku"    />
+        <result property="vdate"    column="vdate"    />
+        <result property="userId"    column="user_id"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+    </resultMap>
+
+    <sql id="selectCodeSkuRelationshipVo">
+        select id, sn, status, sku, vdate, user_id, create_by, create_time, update_by, update_time from code_sku_relationship
+    </sql>
+
+    <select id="selectCodeSkuRelationshipList" parameterType="CodeSkuRelationship" resultMap="CodeSkuRelationshipResult">
+        <include refid="selectCodeSkuRelationshipVo"/>
+        <where>  
+            <if test="sn != null  and sn != ''"> and sn = #{sn}</if>
+            <if test="status != null  and status != ''"> and status = #{status}</if>
+            <if test="sku != null  and sku != ''"> and sku = #{sku}</if>
+            <if test="vdate != null "> and vdate = #{vdate}</if>
+            <if test="userId != null  and userId != ''"> and user_id = #{userId}</if>
+        </where>
+    </select>
+    
+    <select id="selectCodeSkuRelationshipById" parameterType="Long" resultMap="CodeSkuRelationshipResult">
+        <include refid="selectCodeSkuRelationshipVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertCodeSkuRelationship" parameterType="CodeSkuRelationship" useGeneratedKeys="true" keyProperty="id">
+        insert into code_sku_relationship
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="sn != null">sn,</if>
+            <if test="status != null">status,</if>
+            <if test="sku != null">sku,</if>
+            <if test="vdate != null">vdate,</if>
+            <if test="userId != null">user_id,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="sn != null">#{sn},</if>
+            <if test="status != null">#{status},</if>
+            <if test="sku != null">#{sku},</if>
+            <if test="vdate != null">#{vdate},</if>
+            <if test="userId != null">#{userId},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+         </trim>
+    </insert>
+
+    <update id="updateCodeSkuRelationship" parameterType="CodeSkuRelationship">
+        update code_sku_relationship
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="sn != null">sn = #{sn},</if>
+            <if test="status != null">status = #{status},</if>
+            <if test="sku != null">sku = #{sku},</if>
+            <if test="vdate != null">vdate = #{vdate},</if>
+            <if test="userId != null">user_id = #{userId},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteCodeSkuRelationshipById" parameterType="Long">
+        delete from code_sku_relationship where id = #{id}
+    </delete>
+
+    <delete id="deleteCodeSkuRelationshipByIds" parameterType="String">
+        delete from code_sku_relationship where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>