lhq/FT501-WMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

盘点管理

Browse Source
This commit is contained in:
liuhanqing
2025-05-30 16:52:15 +08:00
parent 37d45aa395
commit 4a30b431bb
12 changed files with 300 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ruoyi-admin/src/main/java/com/ruoyi/check/stockcheck/controller/CheckStockinController.java
View File

@@ -1,7 +1,11 @@
package com.ruoyi.check.stockcheck.controller;
import java.util.ArrayList;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import cn.hutool.core.convert.Convert;
import com.ruoyi.check.stockcheckfinish.service.ICheckStockinFinishService;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -33,6 +37,8 @@ public class CheckStockinController extends BaseController
{
@Autowired
private ICheckStockinService checkStockinService;
@Autowired
private ICheckStockinFinishService checkStockinFinishService;
/**
* 查询盘库单据主信息列表
@@ -42,7 +48,13 @@ public class CheckStockinController extends BaseController
public TableDataInfo list(CheckStockin checkStockin)
{
startPage();
List<CheckStockin> list = checkStockinService.selectCheckStockinList(checkStockin);
List<CheckStockin> list = new ArrayList<>();
if (Convert.toInt(checkStockin.getStatus())<4){
list = checkStockinService.selectCheckStockinList(checkStockin);
}else {
list = checkStockinFinishService.selectCheckStockinList(checkStockin);
}
return getDataTable(list);
}

13
ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckdetail/controller/CheckStockinDetailController.java
View File

@@ -1,7 +1,11 @@
package com.ruoyi.check.stockcheckdetail.controller;
import java.util.ArrayList;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import cn.hutool.core.convert.Convert;
import com.ruoyi.check.stockcheckdetailfinish.service.ICheckStockinDetailFinishService;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -33,6 +37,8 @@ public class CheckStockinDetailController extends BaseController
{
@Autowired
private ICheckStockinDetailService checkStockinDetailService;
@Autowired
private ICheckStockinDetailFinishService checkStockinDetailFinishService;
/**
* 查询盘库单据子信息列表
@@ -42,7 +48,12 @@ public class CheckStockinDetailController extends BaseController
public TableDataInfo list(CheckStockinDetail checkStockinDetail)
{
startPage();
List<CheckStockinDetail> list = checkStockinDetailService.selectCheckStockinDetailList(checkStockinDetail);
List<CheckStockinDetail> list = new ArrayList<>();
if (Convert.toInt(checkStockinDetail.getStatus())<4){
list = checkStockinDetailService.selectCheckStockinDetailList(checkStockinDetail);
}else {
list = checkStockinDetailFinishService.selectCheckStockinDetailList(checkStockinDetail);
}
return getDataTable(list);
}

10
ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckdetail/domain/CheckStockinDetail.java
View File

@@ -130,6 +130,16 @@ public class CheckStockinDetail extends BaseEntity
@Excel(name = "备用字段6")
private String spare6;
private String status;
public String getStatus() {
return status;
}
public void setStatus(String status) {
this.status = status;
}
public void setStockCheckDetailId(String stockCheckDetailId)
{
this.stockCheckDetailId = stockCheckDetailId;

4
ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckdetailfinish/mapper/CheckStockinDetailFinishMapper.java
View File

@@ -1,6 +1,8 @@
package com.ruoyi.check.stockcheckdetailfinish.mapper;
import java.util.List;
import com.ruoyi.check.stockcheckdetail.domain.CheckStockinDetail;
import com.ruoyi.check.stockcheckdetailfinish.domain.CheckStockinDetailFinish;
/**
@@ -58,4 +60,6 @@ public interface CheckStockinDetailFinishMapper
* @return 结果
*/
public int deleteCheckStockinDetailFinishByStockCheckDetailIds(String[] stockCheckDetailIds);
List<CheckStockinDetail> selectCheckStockinDetailList(CheckStockinDetail checkStockinDetail);
}

4
ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckdetailfinish/service/ICheckStockinDetailFinishService.java
View File

@@ -1,6 +1,8 @@
package com.ruoyi.check.stockcheckdetailfinish.service;
import java.util.List;
import com.ruoyi.check.stockcheckdetail.domain.CheckStockinDetail;
import com.ruoyi.check.stockcheckdetailfinish.domain.CheckStockinDetailFinish;
/**
@@ -58,4 +60,6 @@ public interface ICheckStockinDetailFinishService
* @return 结果
*/
public int deleteCheckStockinDetailFinishByStockCheckDetailId(String stockCheckDetailId);
List<CheckStockinDetail> selectCheckStockinDetailList(CheckStockinDetail checkStockinDetail);
}

8
ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckdetailfinish/service/impl/CheckStockinDetailFinishServiceImpl.java
View File

@@ -1,6 +1,8 @@
package com.ruoyi.check.stockcheckdetailfinish.service.impl;
import java.util.List;
import com.ruoyi.check.stockcheckdetail.domain.CheckStockinDetail;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.check.stockcheckdetailfinish.mapper.CheckStockinDetailFinishMapper;
@@ -90,4 +92,10 @@ public class CheckStockinDetailFinishServiceImpl implements ICheckStockinDetailF
{
return checkStockinDetailFinishMapper.deleteCheckStockinDetailFinishByStockCheckDetailId(stockCheckDetailId);
}
@Override
public List<CheckStockinDetail> selectCheckStockinDetailList(CheckStockinDetail checkStockinDetail) {
return checkStockinDetailFinishMapper.selectCheckStockinDetailList(checkStockinDetail);
}
}

4
ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckfinish/mapper/CheckStockinFinishMapper.java
View File

@@ -1,6 +1,8 @@
package com.ruoyi.check.stockcheckfinish.mapper;
import java.util.List;
import com.ruoyi.check.stockcheck.domain.CheckStockin;
import com.ruoyi.check.stockcheckfinish.domain.CheckStockinFinish;
/**
@@ -58,4 +60,6 @@ public interface CheckStockinFinishMapper
* @return 结果
*/
public int deleteCheckStockinFinishByStockGuids(String[] stockGuids);
List<CheckStockin> selectCheckStockinList(CheckStockin checkStockin);
}

4
ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckfinish/service/ICheckStockinFinishService.java
View File

@@ -1,6 +1,8 @@
package com.ruoyi.check.stockcheckfinish.service;
import java.util.List;
import com.ruoyi.check.stockcheck.domain.CheckStockin;
import com.ruoyi.check.stockcheckfinish.domain.CheckStockinFinish;
/**
@@ -58,4 +60,6 @@ public interface ICheckStockinFinishService
* @return 结果
*/
public int deleteCheckStockinFinishByStockGuid(String stockGuid);
List<CheckStockin> selectCheckStockinList(CheckStockin checkStockin);
}

7
ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckfinish/service/impl/CheckStockinFinishServiceImpl.java
View File

@@ -1,6 +1,8 @@
package com.ruoyi.check.stockcheckfinish.service.impl;
import java.util.List;
import com.ruoyi.check.stockcheck.domain.CheckStockin;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.check.stockcheckfinish.mapper.CheckStockinFinishMapper;
@@ -90,4 +92,9 @@ public class CheckStockinFinishServiceImpl implements ICheckStockinFinishService
{
return checkStockinFinishMapper.deleteCheckStockinFinishByStockGuid(stockGuid);
}
@Override
public List<CheckStockin> selectCheckStockinList(CheckStockin checkStockin) {
return checkStockinFinishMapper.selectCheckStockinList(checkStockin);
}
}

70
ruoyi-admin/src/main/resources/mapper/check/CheckStockinDetailFinishMapper.xml
View File

@@ -36,6 +36,42 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="scanNumX" column="scan_num_x" />
<result property="scanNumJ" column="scan_num_j" />
</resultMap>
<resultMap type="CheckStockinDetail" id="CheckStockinDetailResult">
<result property="stockCheckDetailId" column="stock_check_detail_id" />
<result property="stockCheckGuid" column="stock_check_guid" />
<result property="stockCheckId" column="stock_check_id" />
<result property="lotNo" column="lot_no" />
<result property="productGuid" column="product_guid" />
<result property="productId" column="product_id" />
<result property="quantity" column="quantity" />
<result property="quantityX" column="quantity_x" />
<result property="quantityJ" column="quantity_j" />
<result property="price" column="price" />
<result property="cargoNo" column="cargo_no" />
<result property="remark" column="remark" />
<result property="assignNum" column="assign_num" />
<result property="assignNumX" column="assign_num_x" />
<result property="assignNumJ" column="assign_num_j" />
<result property="printDate" column="print_date" />
<result property="stockStatus" column="stock_status" />
<result property="supplierId" column="supplier_id" />
<result property="customerId" column="customer_id" />
<result property="unit" column="unit" />
<result property="spec" column="spec" />
<result property="scanNum" column="scan_num" />
<result property="scanNumX" column="scan_num_x" />
<result property="scanNumJ" column="scan_num_j" />
<result property="spare1" column="spare1" />
<result property="spare2" column="spare2" />
<result property="spare3" column="spare3" />
<result property="spare4" column="spare4" />
<result property="spare5" column="spare5" />
<result property="spare6" column="spare6" />
</resultMap>
<sql id="selectCheckStockinDetailVo">
select stock_check_detail_id, stock_check_guid, stock_check_id, lot_no, product_guid, product_id, quantity, quantity_x, quantity_j, price, cargo_no, remark, assign_num, assign_num_x, assign_num_j, print_date, stock_status, supplier_id, customer_id, unit, spec, scan_num, scan_num_x, scan_num_j, spare1, spare2, spare3, spare4, spare5, spare6 from check_stockin_detail_finish
</sql>
<sql id="selectCheckStockinDetailFinishVo">
select stock_check_detail_id, stock_check_guid, stock_check_id, lot_no, product_guid, product_id, quantity, quantity_x, quantity_j, price, cargo_no, remark, assign_num, assign_num_x, assign_num_j, print_date, stock_status, supplier_id, customer_id, unit, spec, spare1, spare2, spare3, spare4, spare5, spare6, scan_num, scan_num_x, scan_num_j from check_stockin_detail_finish
@@ -79,6 +115,40 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<include refid="selectCheckStockinDetailFinishVo"/>
where stock_check_detail_id = #{stockCheckDetailId}
</select>
<select id="selectCheckStockinDetailList"
resultMap="CheckStockinDetailResult">
<include refid="selectCheckStockinDetailVo"/>
<where>
<if test="stockCheckGuid != null and stockCheckGuid != ''"> and stock_check_guid = #{stockCheckGuid}</if>
<if test="stockCheckId != null and stockCheckId != ''"> and stock_check_id = #{stockCheckId}</if>
<if test="lotNo != null and lotNo != ''"> and lot_no = #{lotNo}</if>
<if test="productGuid != null and productGuid != ''"> and product_guid = #{productGuid}</if>
<if test="productId != null and productId != ''"> and product_id = #{productId}</if>
<if test="quantity != null and quantity != ''"> and quantity = #{quantity}</if>
<if test="quantityX != null and quantityX != ''"> and quantity_x = #{quantityX}</if>
<if test="quantityJ != null and quantityJ != ''"> and quantity_j = #{quantityJ}</if>
<if test="price != null and price != ''"> and price = #{price}</if>
<if test="cargoNo != null and cargoNo != ''"> and cargo_no = #{cargoNo}</if>
<if test="assignNum != null and assignNum != ''"> and assign_num = #{assignNum}</if>
<if test="assignNumX != null and assignNumX != ''"> and assign_num_x = #{assignNumX}</if>
<if test="assignNumJ != null and assignNumJ != ''"> and assign_num_j = #{assignNumJ}</if>
<if test="printDate != null and printDate != ''"> and print_date = #{printDate}</if>
<if test="stockStatus != null and stockStatus != ''"> and stock_status = #{stockStatus}</if>
<if test="supplierId != null and supplierId != ''"> and supplier_id = #{supplierId}</if>
<if test="customerId != null and customerId != ''"> and customer_id = #{customerId}</if>
<if test="unit != null and unit != ''"> and unit = #{unit}</if>
<if test="spec != null and spec != ''"> and spec = #{spec}</if>
<if test="scanNum != null and scanNum != ''"> and scan_num = #{scanNum}</if>
<if test="scanNumX != null and scanNumX != ''"> and scan_num_x = #{scanNumX}</if>
<if test="scanNumJ != null and scanNumJ != ''"> and scan_num_j = #{scanNumJ}</if>
<if test="spare1 != null and spare1 != ''"> and spare1 = #{spare1}</if>
<if test="spare2 != null and spare2 != ''"> and spare2 = #{spare2}</if>
<if test="spare3 != null and spare3 != ''"> and spare3 = #{spare3}</if>
<if test="spare4 != null and spare4 != ''"> and spare4 = #{spare4}</if>
<if test="spare5 != null and spare5 != ''"> and spare5 = #{spare5}</if>
<if test="spare6 != null and spare6 != ''"> and spare6 = #{spare6}</if>
</where>
</select>
<insert id="insertCheckStockinDetailFinish" parameterType="CheckStockinDetailFinish">
insert into check_stockin_detail_finish

48
ruoyi-admin/src/main/resources/mapper/check/CheckStockinFinishMapper.xml
View File

@@ -25,7 +25,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="classNo" column="class_no" />
<result property="supplierNo" column="supplier_no" />
</resultMap>
<resultMap type="CheckStockin" id="CheckStockinResult">
<result property="stockGuid" column="stock_guid" />
<result property="stockCheckId" column="stock_check_id" />
<result property="checkType" column="check_type" />
<result property="createDate" column="create_date" />
<result property="createManId" column="create_man_id" />
<result property="status" column="status" />
<result property="warehouseId" column="warehouse_id" />
<result property="finishDate" column="finish_date" />
<result property="erpBill" column="erp_bill" />
<result property="stockSource" column="stock_source" />
<result property="departmentNo" column="department_no" />
<result property="customerNo" column="customer_no" />
<result property="classNo" column="class_no" />
<result property="supplierNo" column="supplier_no" />
<result property="spare1" column="spare1" />
<result property="spare2" column="spare2" />
<result property="spare3" column="spare3" />
<result property="spare4" column="spare4" />
<result property="spare5" column="spare5" />
</resultMap>
<sql id="selectCheckStockinVo">
select stock_guid, stock_check_id, check_type, create_date, create_man_id, status, warehouse_id, finish_date, erp_bill, stock_source, department_no, customer_no, class_no, supplier_no, spare1, spare2, spare3, spare4, spare5 from check_stockin_finish
</sql>
<sql id="selectCheckStockinFinishVo">
select stock_guid, stock_check_id, check_type, create_date, create_man_id, status, warehouse_id, spare5, spare4, spare3, finish_date, spare2, spare1, erp_bill, stock_source, department_no, customer_no, class_no, supplier_no from check_stockin_finish
</sql>
@@ -58,6 +81,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<include refid="selectCheckStockinFinishVo"/>
where stock_guid = #{stockGuid}
</select>
<select id="selectCheckStockinList" resultMap="CheckStockinResult">
<include refid="selectCheckStockinVo"/>
<where>
<if test="stockCheckId != null and stockCheckId != ''"> and stock_check_id = #{stockCheckId}</if>
<if test="checkType != null and checkType != ''"> and check_type = #{checkType}</if>
<if test="createDate != null and createDate != ''"> and create_date = #{createDate}</if>
<if test="createManId != null and createManId != ''"> and create_man_id = #{createManId}</if>
<if test="status != null and status != ''"> and status = #{status}</if>
<if test="warehouseId != null and warehouseId != ''"> and warehouse_id = #{warehouseId}</if>
<if test="finishDate != null and finishDate != ''"> and finish_date = #{finishDate}</if>
<if test="erpBill != null and erpBill != ''"> and erp_bill = #{erpBill}</if>
<if test="stockSource != null and stockSource != ''"> and stock_source = #{stockSource}</if>
<if test="departmentNo != null and departmentNo != ''"> and department_no = #{departmentNo}</if>
<if test="customerNo != null and customerNo != ''"> and customer_no = #{customerNo}</if>
<if test="classNo != null and classNo != ''"> and class_no = #{classNo}</if>
<if test="supplierNo != null and supplierNo != ''"> and supplier_no = #{supplierNo}</if>
<if test="spare1 != null and spare1 != ''"> and spare1 = #{spare1}</if>
<if test="spare2 != null and spare2 != ''"> and spare2 = #{spare2}</if>
<if test="spare3 != null and spare3 != ''"> and spare3 = #{spare3}</if>
<if test="spare4 != null and spare4 != ''"> and spare4 = #{spare4}</if>
<if test="spare5 != null and spare5 != ''"> and spare5 = #{spare5}</if>
</where>
</select>
<insert id="insertCheckStockinFinish" parameterType="CheckStockinFinish">
insert into check_stockin_finish

33
ruoyi-ui/src/views/check/stockCheck/index.vue
View File

@@ -20,7 +20,7 @@
</el-select>
</el-form-item>
<el-form-item label="状态" prop="status">
<el-select v-model="queryParams.checkType" placeholder="请选择盘库类型" clearable>
<el-select v-model="queryParams.status" placeholder="请选择盘库类型" clearable>
<el-option
v-for="dict in dict.type.check_bill_status"
:key="dict.value"
@@ -341,7 +341,8 @@ export default {
queryDetailParams: {
pageNum: 1,
pageSize: 10,
stockCheckGuid: null
stockCheckGuid: null,
status: null
},
// 查询参数
queryParams: {
@@ -351,7 +352,7 @@ export default {
checkType: '1',
createDate: null,
createManId: null,
status: null,
status: '1',
warehouseId: null,
finishDate: null,
erpBill: null,
@@ -393,6 +394,7 @@ export default {
/** 行点击事件处理 */
handleRowClick(row) {
this.queryDetailParams.stockCheckGuid = row.stockGuid
this.queryDetailParams.status = row.status
this.getDetailList()
},
/** 查询盘库单据主信息列表 */
@@ -474,6 +476,7 @@ export default {
this.multiple = !selection.length
if (selection.length === 1) {
this.queryDetailParams.stockCheckGuid = selection[0].stockGuid
this.queryDetailParams.status = selection[0].status
this.getDetailList()
} else {
this.queryDetailParams.stockCheckGuid = null
@@ -537,27 +540,3 @@ export default {
}
</script>
// 明细遮罩层
// 明细选中数组
// 明细总条数
// 明细表格数据
// 明细查询参数
handleDetailSelectionChange(selection) {
this.detailIds = selection.map(item => item.stockCheckDetailId)
}
/** 查询明细列表 */
getDetailList() {
this.detailLoading = true
listStockCheckDetail(this.queryDetailParams).then(response => {
this.stockCheckDetailList = response.rows
this.detailTotal = response.total
this.detailLoading = false
})
}
/** 选择主表行 */
handleSelectionChange(selection) {
this.ids = selection.map(item => item.stockGuid)
this.single = selection.length!==1
this.multiple = !selection.length
}
}