diff --git a/ruoyi-admin/src/main/java/com/ruoyi/check/difference/controller/CheckDifferenceRecordController.java b/ruoyi-admin/src/main/java/com/ruoyi/check/difference/controller/CheckDifferenceRecordController.java new file mode 100644 index 0000000..313eac1 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/check/difference/controller/CheckDifferenceRecordController.java @@ -0,0 +1,104 @@ +package com.ruoyi.check.difference.controller; + +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.check.difference.domain.CheckDifferenceRecord; +import com.ruoyi.check.difference.service.ICheckDifferenceRecordService; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 盘点差异Controller + * + * @author ruoyi + * @date 2025-05-28 + */ +@RestController +@RequestMapping("/check/difference") +public class CheckDifferenceRecordController extends BaseController +{ + @Autowired + private ICheckDifferenceRecordService checkDifferenceRecordService; + + /** + * 查询盘点差异列表 + */ + @PreAuthorize("@ss.hasPermi('check:difference:list')") + @GetMapping("/list") + public TableDataInfo list(CheckDifferenceRecord checkDifferenceRecord) + { + startPage(); + List list = checkDifferenceRecordService.selectCheckDifferenceRecordList(checkDifferenceRecord); + return getDataTable(list); + } + + /** + * 导出盘点差异列表 + */ + @PreAuthorize("@ss.hasPermi('check:difference:export')") + @Log(title = "盘点差异", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, CheckDifferenceRecord checkDifferenceRecord) + { + List list = checkDifferenceRecordService.selectCheckDifferenceRecordList(checkDifferenceRecord); + ExcelUtil util = new ExcelUtil(CheckDifferenceRecord.class); + util.exportExcel(response, list, "盘点差异数据"); + } + + /** + * 获取盘点差异详细信息 + */ + @PreAuthorize("@ss.hasPermi('check:difference:query')") + @GetMapping(value = "/{checkGuid}") + public AjaxResult getInfo(@PathVariable("checkGuid") String checkGuid) + { + return success(checkDifferenceRecordService.selectCheckDifferenceRecordByCheckGuid(checkGuid)); + } + + /** + * 新增盘点差异 + */ + @PreAuthorize("@ss.hasPermi('check:difference:add')") + @Log(title = "盘点差异", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody CheckDifferenceRecord checkDifferenceRecord) + { + return toAjax(checkDifferenceRecordService.insertCheckDifferenceRecord(checkDifferenceRecord)); + } + + /** + * 修改盘点差异 + */ + @PreAuthorize("@ss.hasPermi('check:difference:edit')") + @Log(title = "盘点差异", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody CheckDifferenceRecord checkDifferenceRecord) + { + return toAjax(checkDifferenceRecordService.updateCheckDifferenceRecord(checkDifferenceRecord)); + } + + /** + * 删除盘点差异 + */ + @PreAuthorize("@ss.hasPermi('check:difference:remove')") + @Log(title = "盘点差异", businessType = BusinessType.DELETE) + @DeleteMapping("/{checkGuids}") + public AjaxResult remove(@PathVariable String[] checkGuids) + { + return toAjax(checkDifferenceRecordService.deleteCheckDifferenceRecordByCheckGuids(checkGuids)); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/check/difference/domain/CheckDifferenceRecord.java b/ruoyi-admin/src/main/java/com/ruoyi/check/difference/domain/CheckDifferenceRecord.java new file mode 100644 index 0000000..a10a627 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/check/difference/domain/CheckDifferenceRecord.java @@ -0,0 +1,218 @@ +package com.ruoyi.check.difference.domain; + +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; + +/** + * 盘点差异对象 check_difference_record + * + * @author ruoyi + * @date 2025-05-28 + */ +public class CheckDifferenceRecord extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 盘点id */ + private String checkGuid; + + /** 盘点单据id */ + @Excel(name = "盘点单据id") + private String checkStockDetailId; + + /** 库存id */ + @Excel(name = "库存id") + private String stockId; + + /** 托盘 */ + @Excel(name = "托盘") + private String trayCode; + + /** 货位id */ + @Excel(name = "货位id") + private String cargoSpaceId; + + /** 物料id */ + @Excel(name = "物料id") + private String productId; + + /** 批次号 */ + @Excel(name = "批次号") + private String lotNo; + + /** 供应商 */ + @Excel(name = "供应商") + private String supplier; + + /** 客户 */ + @Excel(name = "客户") + private String customer; + + /** 原值 */ + @Excel(name = "原值") + private String oldQuantity; + + /** 新值 */ + @Excel(name = "新值") + private String newQuantity; + + /** 操作方式 */ + @Excel(name = "操作方式") + private Long recordType; + + /** 物料guid */ + @Excel(name = "物料guid") + private String productGuid; + + public void setCheckGuid(String checkGuid) + { + this.checkGuid = checkGuid; + } + + public String getCheckGuid() + { + return checkGuid; + } + + public void setCheckStockDetailId(String checkStockDetailId) + { + this.checkStockDetailId = checkStockDetailId; + } + + public String getCheckStockDetailId() + { + return checkStockDetailId; + } + + public void setStockId(String stockId) + { + this.stockId = stockId; + } + + public String getStockId() + { + return stockId; + } + + public void setTrayCode(String trayCode) + { + this.trayCode = trayCode; + } + + public String getTrayCode() + { + return trayCode; + } + + public void setCargoSpaceId(String cargoSpaceId) + { + this.cargoSpaceId = cargoSpaceId; + } + + public String getCargoSpaceId() + { + return cargoSpaceId; + } + + public void setProductId(String productId) + { + this.productId = productId; + } + + public String getProductId() + { + return productId; + } + + public void setLotNo(String lotNo) + { + this.lotNo = lotNo; + } + + public String getLotNo() + { + return lotNo; + } + + public void setSupplier(String supplier) + { + this.supplier = supplier; + } + + public String getSupplier() + { + return supplier; + } + + public void setCustomer(String customer) + { + this.customer = customer; + } + + public String getCustomer() + { + return customer; + } + + public void setOldQuantity(String oldQuantity) + { + this.oldQuantity = oldQuantity; + } + + public String getOldQuantity() + { + return oldQuantity; + } + + public void setNewQuantity(String newQuantity) + { + this.newQuantity = newQuantity; + } + + public String getNewQuantity() + { + return newQuantity; + } + + public void setRecordType(Long recordType) + { + this.recordType = recordType; + } + + public Long getRecordType() + { + return recordType; + } + + public void setProductGuid(String productGuid) + { + this.productGuid = productGuid; + } + + public String getProductGuid() + { + return productGuid; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("checkGuid", getCheckGuid()) + .append("checkStockDetailId", getCheckStockDetailId()) + .append("stockId", getStockId()) + .append("trayCode", getTrayCode()) + .append("cargoSpaceId", getCargoSpaceId()) + .append("productId", getProductId()) + .append("lotNo", getLotNo()) + .append("supplier", getSupplier()) + .append("customer", getCustomer()) + .append("oldQuantity", getOldQuantity()) + .append("newQuantity", getNewQuantity()) + .append("recordType", getRecordType()) + .append("createTime", getCreateTime()) + .append("productGuid", getProductGuid()) + .toString(); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/check/difference/mapper/CheckDifferenceRecordMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/check/difference/mapper/CheckDifferenceRecordMapper.java new file mode 100644 index 0000000..c659578 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/check/difference/mapper/CheckDifferenceRecordMapper.java @@ -0,0 +1,61 @@ +package com.ruoyi.check.difference.mapper; + +import java.util.List; +import com.ruoyi.check.difference.domain.CheckDifferenceRecord; + +/** + * 盘点差异Mapper接口 + * + * @author ruoyi + * @date 2025-05-28 + */ +public interface CheckDifferenceRecordMapper +{ + /** + * 查询盘点差异 + * + * @param checkGuid 盘点差异主键 + * @return 盘点差异 + */ + public CheckDifferenceRecord selectCheckDifferenceRecordByCheckGuid(String checkGuid); + + /** + * 查询盘点差异列表 + * + * @param checkDifferenceRecord 盘点差异 + * @return 盘点差异集合 + */ + public List selectCheckDifferenceRecordList(CheckDifferenceRecord checkDifferenceRecord); + + /** + * 新增盘点差异 + * + * @param checkDifferenceRecord 盘点差异 + * @return 结果 + */ + public int insertCheckDifferenceRecord(CheckDifferenceRecord checkDifferenceRecord); + + /** + * 修改盘点差异 + * + * @param checkDifferenceRecord 盘点差异 + * @return 结果 + */ + public int updateCheckDifferenceRecord(CheckDifferenceRecord checkDifferenceRecord); + + /** + * 删除盘点差异 + * + * @param checkGuid 盘点差异主键 + * @return 结果 + */ + public int deleteCheckDifferenceRecordByCheckGuid(String checkGuid); + + /** + * 批量删除盘点差异 + * + * @param checkGuids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteCheckDifferenceRecordByCheckGuids(String[] checkGuids); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/check/difference/service/ICheckDifferenceRecordService.java b/ruoyi-admin/src/main/java/com/ruoyi/check/difference/service/ICheckDifferenceRecordService.java new file mode 100644 index 0000000..03a9871 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/check/difference/service/ICheckDifferenceRecordService.java @@ -0,0 +1,61 @@ +package com.ruoyi.check.difference.service; + +import java.util.List; +import com.ruoyi.check.difference.domain.CheckDifferenceRecord; + +/** + * 盘点差异Service接口 + * + * @author ruoyi + * @date 2025-05-28 + */ +public interface ICheckDifferenceRecordService +{ + /** + * 查询盘点差异 + * + * @param checkGuid 盘点差异主键 + * @return 盘点差异 + */ + public CheckDifferenceRecord selectCheckDifferenceRecordByCheckGuid(String checkGuid); + + /** + * 查询盘点差异列表 + * + * @param checkDifferenceRecord 盘点差异 + * @return 盘点差异集合 + */ + public List selectCheckDifferenceRecordList(CheckDifferenceRecord checkDifferenceRecord); + + /** + * 新增盘点差异 + * + * @param checkDifferenceRecord 盘点差异 + * @return 结果 + */ + public int insertCheckDifferenceRecord(CheckDifferenceRecord checkDifferenceRecord); + + /** + * 修改盘点差异 + * + * @param checkDifferenceRecord 盘点差异 + * @return 结果 + */ + public int updateCheckDifferenceRecord(CheckDifferenceRecord checkDifferenceRecord); + + /** + * 批量删除盘点差异 + * + * @param checkGuids 需要删除的盘点差异主键集合 + * @return 结果 + */ + public int deleteCheckDifferenceRecordByCheckGuids(String[] checkGuids); + + /** + * 删除盘点差异信息 + * + * @param checkGuid 盘点差异主键 + * @return 结果 + */ + public int deleteCheckDifferenceRecordByCheckGuid(String checkGuid); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/check/difference/service/impl/CheckDifferenceRecordServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/check/difference/service/impl/CheckDifferenceRecordServiceImpl.java new file mode 100644 index 0000000..ecaddce --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/check/difference/service/impl/CheckDifferenceRecordServiceImpl.java @@ -0,0 +1,95 @@ +package com.ruoyi.check.difference.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.check.difference.mapper.CheckDifferenceRecordMapper; +import com.ruoyi.check.difference.domain.CheckDifferenceRecord; +import com.ruoyi.check.difference.service.ICheckDifferenceRecordService; + +/** + * 盘点差异Service业务层处理 + * + * @author ruoyi + * @date 2025-05-28 + */ +@Service +public class CheckDifferenceRecordServiceImpl implements ICheckDifferenceRecordService +{ + @Autowired + private CheckDifferenceRecordMapper checkDifferenceRecordMapper; + + /** + * 查询盘点差异 + * + * @param checkGuid 盘点差异主键 + * @return 盘点差异 + */ + @Override + public CheckDifferenceRecord selectCheckDifferenceRecordByCheckGuid(String checkGuid) + { + return checkDifferenceRecordMapper.selectCheckDifferenceRecordByCheckGuid(checkGuid); + } + + /** + * 查询盘点差异列表 + * + * @param checkDifferenceRecord 盘点差异 + * @return 盘点差异 + */ + @Override + public List selectCheckDifferenceRecordList(CheckDifferenceRecord checkDifferenceRecord) + { + return checkDifferenceRecordMapper.selectCheckDifferenceRecordList(checkDifferenceRecord); + } + + /** + * 新增盘点差异 + * + * @param checkDifferenceRecord 盘点差异 + * @return 结果 + */ + @Override + public int insertCheckDifferenceRecord(CheckDifferenceRecord checkDifferenceRecord) + { + checkDifferenceRecord.setCreateTime(DateUtils.getNowDate()); + return checkDifferenceRecordMapper.insertCheckDifferenceRecord(checkDifferenceRecord); + } + + /** + * 修改盘点差异 + * + * @param checkDifferenceRecord 盘点差异 + * @return 结果 + */ + @Override + public int updateCheckDifferenceRecord(CheckDifferenceRecord checkDifferenceRecord) + { + return checkDifferenceRecordMapper.updateCheckDifferenceRecord(checkDifferenceRecord); + } + + /** + * 批量删除盘点差异 + * + * @param checkGuids 需要删除的盘点差异主键 + * @return 结果 + */ + @Override + public int deleteCheckDifferenceRecordByCheckGuids(String[] checkGuids) + { + return checkDifferenceRecordMapper.deleteCheckDifferenceRecordByCheckGuids(checkGuids); + } + + /** + * 删除盘点差异信息 + * + * @param checkGuid 盘点差异主键 + * @return 结果 + */ + @Override + public int deleteCheckDifferenceRecordByCheckGuid(String checkGuid) + { + return checkDifferenceRecordMapper.deleteCheckDifferenceRecordByCheckGuid(checkGuid); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/controller/InStockinController.java b/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/controller/InStockinController.java index e0cd68b..eb71e1b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/controller/InStockinController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/controller/InStockinController.java @@ -1,7 +1,13 @@ package com.ruoyi.in.stockin.controller; +import java.util.ArrayList; import java.util.List; import javax.servlet.http.HttpServletResponse; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.convert.Convert; +import com.ruoyi.in.stockinfinish.domain.InStockinFinish; +import com.ruoyi.in.stockinfinish.service.IInStockinFinishService; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -33,6 +39,8 @@ public class InStockinController extends BaseController { @Autowired private IInStockinService inStockinService; + @Autowired + private IInStockinFinishService inStockinFinishService; /** * 查询入库单据列表 @@ -42,7 +50,12 @@ public class InStockinController extends BaseController public TableDataInfo list(InStockin inStockin) { startPage(); - List list = inStockinService.selectInStockinList(inStockin); + List list = new ArrayList<>(); + if (Convert.toInt(inStockin.getStatus())<4){ + list = inStockinService.selectInStockinList(inStockin); + }else { + list = inStockinFinishService.selectInStockinFinishListByInStockin(inStockin); + } return getDataTable(list); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/domain/InStockin.java b/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/domain/InStockin.java index a9eedb0..7cc1ee8 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/domain/InStockin.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/domain/InStockin.java @@ -7,7 +7,7 @@ import com.ruoyi.common.core.domain.BaseEntity; /** * 入库单据对象 in_stockin - * + * * @author ruoyi * @date 2025-05-20 */ @@ -31,8 +31,10 @@ public class InStockin extends BaseEntity private String createDate; /** 创建人 */ - @Excel(name = "创建人") + private String createManId; + @Excel(name = "创建人") + private String createManName; /** 单据状态 */ @Excel(name = "单据状态") @@ -41,6 +43,8 @@ public class InStockin extends BaseEntity /** 仓库ID */ @Excel(name = "仓库ID") private String warehouseId; + @Excel(name = "仓库") + private String warehouseName; /** 完成日期 */ @Excel(name = " 完成日期") @@ -57,6 +61,8 @@ public class InStockin extends BaseEntity /** 部门编码 */ @Excel(name = "部门编码") private String departmentNo; + @Excel(name = "部门") + private String departmentName; /** 客户编码 */ @Excel(name = "客户编码") @@ -69,6 +75,8 @@ public class InStockin extends BaseEntity /** 供应商编码 */ @Excel(name = "供应商编码") private String supplierNo; + @Excel(name = "供应商") + private String supplierName; /** 备用字段1 */ @Excel(name = "备用字段1") @@ -90,192 +98,224 @@ public class InStockin extends BaseEntity @Excel(name = "备用字段5") private String spare5; - public void setStockinGuid(String stockinGuid) + public String getCreateManName() { + return createManName; + } + + public void setCreateManName(String createManName) { + this.createManName = createManName; + } + + public String getWarehouseName() { + return warehouseName; + } + + public void setWarehouseName(String warehouseName) { + this.warehouseName = warehouseName; + } + + public String getDepartmentName() { + return departmentName; + } + + public void setDepartmentName(String departmentName) { + this.departmentName = departmentName; + } + + public String getSupplierName() { + return supplierName; + } + + public void setSupplierName(String supplierName) { + this.supplierName = supplierName; + } + + public void setStockinGuid(String stockinGuid) { this.stockinGuid = stockinGuid; } - public String getStockinGuid() + public String getStockinGuid() { return stockinGuid; } - public void setStockinId(String stockinId) + public void setStockinId(String stockinId) { this.stockinId = stockinId; } - public String getStockinId() + public String getStockinId() { return stockinId; } - public void setInType(String inType) + public void setInType(String inType) { this.inType = inType; } - public String getInType() + public String getInType() { return inType; } - public void setCreateDate(String createDate) + public void setCreateDate(String createDate) { this.createDate = createDate; } - public String getCreateDate() + public String getCreateDate() { return createDate; } - public void setCreateManId(String createManId) + public void setCreateManId(String createManId) { this.createManId = createManId; } - public String getCreateManId() + public String getCreateManId() { return createManId; } - public void setStatus(String status) + public void setStatus(String status) { this.status = status; } - public String getStatus() + public String getStatus() { return status; } - public void setWarehouseId(String warehouseId) + public void setWarehouseId(String warehouseId) { this.warehouseId = warehouseId; } - public String getWarehouseId() + public String getWarehouseId() { return warehouseId; } - public void setFinishDate(String finishDate) + public void setFinishDate(String finishDate) { this.finishDate = finishDate; } - public String getFinishDate() + public String getFinishDate() { return finishDate; } - public void setErpBill(String erpBill) + public void setErpBill(String erpBill) { this.erpBill = erpBill; } - public String getErpBill() + public String getErpBill() { return erpBill; } - public void setStockSource(String stockSource) + public void setStockSource(String stockSource) { this.stockSource = stockSource; } - public String getStockSource() + public String getStockSource() { return stockSource; } - public void setDepartmentNo(String departmentNo) + public void setDepartmentNo(String departmentNo) { this.departmentNo = departmentNo; } - public String getDepartmentNo() + public String getDepartmentNo() { return departmentNo; } - public void setCustomerNo(String customerNo) + public void setCustomerNo(String customerNo) { this.customerNo = customerNo; } - public String getCustomerNo() + public String getCustomerNo() { return customerNo; } - public void setClassNo(String classNo) + public void setClassNo(String classNo) { this.classNo = classNo; } - public String getClassNo() + public String getClassNo() { return classNo; } - public void setSupplierNo(String supplierNo) + public void setSupplierNo(String supplierNo) { this.supplierNo = supplierNo; } - public String getSupplierNo() + public String getSupplierNo() { return supplierNo; } - public void setSpare1(String spare1) + public void setSpare1(String spare1) { this.spare1 = spare1; } - public String getSpare1() + public String getSpare1() { return spare1; } - public void setSpare2(String spare2) + public void setSpare2(String spare2) { this.spare2 = spare2; } - public String getSpare2() + public String getSpare2() { return spare2; } - public void setSpare4(String spare4) + public void setSpare4(String spare4) { this.spare4 = spare4; } - public String getSpare4() + public String getSpare4() { return spare4; } - public void setSpare3(String spare3) + public void setSpare3(String spare3) { this.spare3 = spare3; } - public String getSpare3() + public String getSpare3() { return spare3; } - public void setSpare5(String spare5) + public void setSpare5(String spare5) { this.spare5 = spare5; } - public String getSpare5() + public String getSpare5() { return spare5; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/service/impl/InStockinServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/service/impl/InStockinServiceImpl.java index 3c1d07d..ebeccb9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/service/impl/InStockinServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/service/impl/InStockinServiceImpl.java @@ -1,5 +1,6 @@ package com.ruoyi.in.stockin.service.impl; +import java.util.Arrays; import java.util.List; import cn.hutool.core.collection.CollUtil; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/controller/InStockinDetailController.java b/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/controller/InStockinDetailController.java index f1d0f04..a1a51a1 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/controller/InStockinDetailController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/controller/InStockinDetailController.java @@ -1,17 +1,15 @@ package com.ruoyi.in.stockindetail.controller; +import java.util.ArrayList; import java.util.List; +import java.util.Map; import javax.servlet.http.HttpServletResponse; + +import cn.hutool.core.convert.Convert; +import com.ruoyi.in.stockindetailfinish.service.IInStockinDetailFinishService; 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 org.springframework.web.bind.annotation.*; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; @@ -23,7 +21,7 @@ import com.ruoyi.common.core.page.TableDataInfo; /** * 入库单据子表Controller - * + * * @author ruoyi * @date 2025-05-20 */ @@ -33,6 +31,8 @@ public class InStockinDetailController extends BaseController { @Autowired private IInStockinDetailService inStockinDetailService; + @Autowired + private IInStockinDetailFinishService inStockinDetailFinishService; /** * 查询入库单据子表列表 @@ -42,7 +42,12 @@ public class InStockinDetailController extends BaseController public TableDataInfo list(InStockinDetail inStockinDetail) { startPage(); - List list = inStockinDetailService.selectInStockinDetailList(inStockinDetail); + List list = new ArrayList<>(); + if (Convert.toInt(inStockinDetail.getStatus())<4){ + list = inStockinDetailService.selectInStockinDetailList(inStockinDetail); + }else { + list = inStockinDetailFinishService.selectInStockinDetailList(inStockinDetail); + } return getDataTable(list); } @@ -101,4 +106,16 @@ public class InStockinDetailController extends BaseController { return toAjax(inStockinDetailService.deleteInStockinDetailByStockinDetailIds(stockinDetailIds)); } + + /** + * 打印条码 + * @param param + * @return + */ + @PreAuthorize("@ss.hasPermi('in:stockIn:barcodePrinting')") + @Log(title = "入库单据", businessType = BusinessType.INSERT) + @PostMapping("barcodePrinting") + public AjaxResult barcodePrinting(@RequestBody Map param) { + return toAjax(inStockinDetailService.barcodePrinting(param)); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/domain/InStockinDetail.java b/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/domain/InStockinDetail.java index d134c72..d5226e1 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/domain/InStockinDetail.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/domain/InStockinDetail.java @@ -133,4 +133,6 @@ public class InStockinDetail extends BaseEntity @Excel(name = "备用字段6") private String spare6; + private String status; + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/service/IInStockinDetailService.java b/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/service/IInStockinDetailService.java index 4de43c1..5cb2fdd 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/service/IInStockinDetailService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/service/IInStockinDetailService.java @@ -1,6 +1,7 @@ package com.ruoyi.in.stockindetail.service; import java.util.List; +import java.util.Map; import com.ruoyi.in.stockin.domain.InStockin; import com.ruoyi.in.stockindetail.domain.InStockinDetail; @@ -74,4 +75,6 @@ public interface IInStockinDetailService void insertInStockinDetailHistory(InStockin inStockin); void deleteInStockinDetailByStockinGuid(String stockinGuid); + + int barcodePrinting(Map stockinDetailId); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/service/impl/InStockinDetailServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/service/impl/InStockinDetailServiceImpl.java index e90ea73..a5a5ea2 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/service/impl/InStockinDetailServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/service/impl/InStockinDetailServiceImpl.java @@ -1,6 +1,8 @@ package com.ruoyi.in.stockindetail.service.impl; +import java.util.Arrays; import java.util.List; +import java.util.Map; import com.ruoyi.in.stockin.domain.InStockin; import org.springframework.beans.factory.annotation.Autowired; @@ -107,4 +109,10 @@ public class InStockinDetailServiceImpl implements IInStockinDetailService public void deleteInStockinDetailByStockinGuid(String stockinGuid) { inStockinDetailMapper.deleteInStockinDetailByStockinGuid(stockinGuid); } + + @Override + public int barcodePrinting(Map map) { + System.out.println(map); + return 0; + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetailfinish/mapper/InStockinDetailFinishMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetailfinish/mapper/InStockinDetailFinishMapper.java index 45d65c2..2097108 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetailfinish/mapper/InStockinDetailFinishMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetailfinish/mapper/InStockinDetailFinishMapper.java @@ -1,19 +1,21 @@ package com.ruoyi.in.stockindetailfinish.mapper; import java.util.List; + +import com.ruoyi.in.stockindetail.domain.InStockinDetail; import com.ruoyi.in.stockindetailfinish.domain.InStockinDetailFinish; /** * 历史入库单据子信息Mapper接口 - * + * * @author ruoyi * @date 2025-05-28 */ -public interface InStockinDetailFinishMapper +public interface InStockinDetailFinishMapper { /** * 查询历史入库单据子信息 - * + * * @param stockinDetailId 历史入库单据子信息主键 * @return 历史入库单据子信息 */ @@ -21,7 +23,7 @@ public interface InStockinDetailFinishMapper /** * 查询历史入库单据子信息列表 - * + * * @param inStockinDetailFinish 历史入库单据子信息 * @return 历史入库单据子信息集合 */ @@ -29,7 +31,7 @@ public interface InStockinDetailFinishMapper /** * 新增历史入库单据子信息 - * + * * @param inStockinDetailFinish 历史入库单据子信息 * @return 结果 */ @@ -37,7 +39,7 @@ public interface InStockinDetailFinishMapper /** * 修改历史入库单据子信息 - * + * * @param inStockinDetailFinish 历史入库单据子信息 * @return 结果 */ @@ -45,7 +47,7 @@ public interface InStockinDetailFinishMapper /** * 删除历史入库单据子信息 - * + * * @param stockinDetailId 历史入库单据子信息主键 * @return 结果 */ @@ -53,9 +55,11 @@ public interface InStockinDetailFinishMapper /** * 批量删除历史入库单据子信息 - * + * * @param stockinDetailIds 需要删除的数据主键集合 * @return 结果 */ public int deleteInStockinDetailFinishByStockinDetailIds(String[] stockinDetailIds); + + List selectInStockinDetailFinishListByInStockinDetail(InStockinDetail inStockinDetail); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetailfinish/service/IInStockinDetailFinishService.java b/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetailfinish/service/IInStockinDetailFinishService.java index 5562e29..38b96c0 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetailfinish/service/IInStockinDetailFinishService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetailfinish/service/IInStockinDetailFinishService.java @@ -1,19 +1,21 @@ package com.ruoyi.in.stockindetailfinish.service; import java.util.List; + +import com.ruoyi.in.stockindetail.domain.InStockinDetail; import com.ruoyi.in.stockindetailfinish.domain.InStockinDetailFinish; /** * 历史入库单据子信息Service接口 - * + * * @author ruoyi * @date 2025-05-28 */ -public interface IInStockinDetailFinishService +public interface IInStockinDetailFinishService { /** * 查询历史入库单据子信息 - * + * * @param stockinDetailId 历史入库单据子信息主键 * @return 历史入库单据子信息 */ @@ -21,7 +23,7 @@ public interface IInStockinDetailFinishService /** * 查询历史入库单据子信息列表 - * + * * @param inStockinDetailFinish 历史入库单据子信息 * @return 历史入库单据子信息集合 */ @@ -29,7 +31,7 @@ public interface IInStockinDetailFinishService /** * 新增历史入库单据子信息 - * + * * @param inStockinDetailFinish 历史入库单据子信息 * @return 结果 */ @@ -37,7 +39,7 @@ public interface IInStockinDetailFinishService /** * 修改历史入库单据子信息 - * + * * @param inStockinDetailFinish 历史入库单据子信息 * @return 结果 */ @@ -45,7 +47,7 @@ public interface IInStockinDetailFinishService /** * 批量删除历史入库单据子信息 - * + * * @param stockinDetailIds 需要删除的历史入库单据子信息主键集合 * @return 结果 */ @@ -53,9 +55,11 @@ public interface IInStockinDetailFinishService /** * 删除历史入库单据子信息信息 - * + * * @param stockinDetailId 历史入库单据子信息主键 * @return 结果 */ public int deleteInStockinDetailFinishByStockinDetailId(String stockinDetailId); + + List selectInStockinDetailList(InStockinDetail inStockinDetail); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetailfinish/service/impl/InStockinDetailFinishServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetailfinish/service/impl/InStockinDetailFinishServiceImpl.java index eff7737..e89cc6e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetailfinish/service/impl/InStockinDetailFinishServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetailfinish/service/impl/InStockinDetailFinishServiceImpl.java @@ -1,6 +1,8 @@ package com.ruoyi.in.stockindetailfinish.service.impl; import java.util.List; + +import com.ruoyi.in.stockindetail.domain.InStockinDetail; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.in.stockindetailfinish.mapper.InStockinDetailFinishMapper; @@ -9,19 +11,19 @@ import com.ruoyi.in.stockindetailfinish.service.IInStockinDetailFinishService; /** * 历史入库单据子信息Service业务层处理 - * + * * @author ruoyi * @date 2025-05-28 */ @Service -public class InStockinDetailFinishServiceImpl implements IInStockinDetailFinishService +public class InStockinDetailFinishServiceImpl implements IInStockinDetailFinishService { @Autowired private InStockinDetailFinishMapper inStockinDetailFinishMapper; /** * 查询历史入库单据子信息 - * + * * @param stockinDetailId 历史入库单据子信息主键 * @return 历史入库单据子信息 */ @@ -33,7 +35,7 @@ public class InStockinDetailFinishServiceImpl implements IInStockinDetailFinishS /** * 查询历史入库单据子信息列表 - * + * * @param inStockinDetailFinish 历史入库单据子信息 * @return 历史入库单据子信息 */ @@ -45,7 +47,7 @@ public class InStockinDetailFinishServiceImpl implements IInStockinDetailFinishS /** * 新增历史入库单据子信息 - * + * * @param inStockinDetailFinish 历史入库单据子信息 * @return 结果 */ @@ -57,7 +59,7 @@ public class InStockinDetailFinishServiceImpl implements IInStockinDetailFinishS /** * 修改历史入库单据子信息 - * + * * @param inStockinDetailFinish 历史入库单据子信息 * @return 结果 */ @@ -69,7 +71,7 @@ public class InStockinDetailFinishServiceImpl implements IInStockinDetailFinishS /** * 批量删除历史入库单据子信息 - * + * * @param stockinDetailIds 需要删除的历史入库单据子信息主键 * @return 结果 */ @@ -81,7 +83,7 @@ public class InStockinDetailFinishServiceImpl implements IInStockinDetailFinishS /** * 删除历史入库单据子信息信息 - * + * * @param stockinDetailId 历史入库单据子信息主键 * @return 结果 */ @@ -90,4 +92,9 @@ public class InStockinDetailFinishServiceImpl implements IInStockinDetailFinishS { return inStockinDetailFinishMapper.deleteInStockinDetailFinishByStockinDetailId(stockinDetailId); } + + @Override + public List selectInStockinDetailList(InStockinDetail inStockinDetail) { + return inStockinDetailFinishMapper.selectInStockinDetailFinishListByInStockinDetail(inStockinDetail); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/stockinfinish/mapper/InStockinFinishMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/in/stockinfinish/mapper/InStockinFinishMapper.java index a46ed5e..0ab3e80 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/in/stockinfinish/mapper/InStockinFinishMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockinfinish/mapper/InStockinFinishMapper.java @@ -1,19 +1,21 @@ package com.ruoyi.in.stockinfinish.mapper; import java.util.List; + +import com.ruoyi.in.stockin.domain.InStockin; import com.ruoyi.in.stockinfinish.domain.InStockinFinish; /** * 历史入库单据主信息Mapper接口 - * + * * @author ruoyi * @date 2025-05-28 */ -public interface InStockinFinishMapper +public interface InStockinFinishMapper { /** * 查询历史入库单据主信息 - * + * * @param stockinGuid 历史入库单据主信息主键 * @return 历史入库单据主信息 */ @@ -21,7 +23,7 @@ public interface InStockinFinishMapper /** * 查询历史入库单据主信息列表 - * + * * @param inStockinFinish 历史入库单据主信息 * @return 历史入库单据主信息集合 */ @@ -29,7 +31,7 @@ public interface InStockinFinishMapper /** * 新增历史入库单据主信息 - * + * * @param inStockinFinish 历史入库单据主信息 * @return 结果 */ @@ -37,7 +39,7 @@ public interface InStockinFinishMapper /** * 修改历史入库单据主信息 - * + * * @param inStockinFinish 历史入库单据主信息 * @return 结果 */ @@ -45,7 +47,7 @@ public interface InStockinFinishMapper /** * 删除历史入库单据主信息 - * + * * @param stockinGuid 历史入库单据主信息主键 * @return 结果 */ @@ -53,9 +55,11 @@ public interface InStockinFinishMapper /** * 批量删除历史入库单据主信息 - * + * * @param stockinGuids 需要删除的数据主键集合 * @return 结果 */ public int deleteInStockinFinishByStockinGuids(String[] stockinGuids); + + List selectInStockinFinishListByInStockin(InStockin inStockin); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/stockinfinish/service/IInStockinFinishService.java b/ruoyi-admin/src/main/java/com/ruoyi/in/stockinfinish/service/IInStockinFinishService.java index bbe44f7..f8a04bd 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/in/stockinfinish/service/IInStockinFinishService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockinfinish/service/IInStockinFinishService.java @@ -1,19 +1,21 @@ package com.ruoyi.in.stockinfinish.service; import java.util.List; + +import com.ruoyi.in.stockin.domain.InStockin; import com.ruoyi.in.stockinfinish.domain.InStockinFinish; /** * 历史入库单据主信息Service接口 - * + * * @author ruoyi * @date 2025-05-28 */ -public interface IInStockinFinishService +public interface IInStockinFinishService { /** * 查询历史入库单据主信息 - * + * * @param stockinGuid 历史入库单据主信息主键 * @return 历史入库单据主信息 */ @@ -21,7 +23,7 @@ public interface IInStockinFinishService /** * 查询历史入库单据主信息列表 - * + * * @param inStockinFinish 历史入库单据主信息 * @return 历史入库单据主信息集合 */ @@ -29,7 +31,7 @@ public interface IInStockinFinishService /** * 新增历史入库单据主信息 - * + * * @param inStockinFinish 历史入库单据主信息 * @return 结果 */ @@ -37,7 +39,7 @@ public interface IInStockinFinishService /** * 修改历史入库单据主信息 - * + * * @param inStockinFinish 历史入库单据主信息 * @return 结果 */ @@ -45,7 +47,7 @@ public interface IInStockinFinishService /** * 批量删除历史入库单据主信息 - * + * * @param stockinGuids 需要删除的历史入库单据主信息主键集合 * @return 结果 */ @@ -53,9 +55,11 @@ public interface IInStockinFinishService /** * 删除历史入库单据主信息信息 - * + * * @param stockinGuid 历史入库单据主信息主键 * @return 结果 */ public int deleteInStockinFinishByStockinGuid(String stockinGuid); + + List selectInStockinFinishListByInStockin(InStockin inStockin); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/stockinfinish/service/impl/InStockinFinishServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/in/stockinfinish/service/impl/InStockinFinishServiceImpl.java index 3b7b869..81f398c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/in/stockinfinish/service/impl/InStockinFinishServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockinfinish/service/impl/InStockinFinishServiceImpl.java @@ -1,6 +1,8 @@ package com.ruoyi.in.stockinfinish.service.impl; import java.util.List; + +import com.ruoyi.in.stockin.domain.InStockin; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.in.stockinfinish.mapper.InStockinFinishMapper; @@ -9,19 +11,19 @@ import com.ruoyi.in.stockinfinish.service.IInStockinFinishService; /** * 历史入库单据主信息Service业务层处理 - * + * * @author ruoyi * @date 2025-05-28 */ @Service -public class InStockinFinishServiceImpl implements IInStockinFinishService +public class InStockinFinishServiceImpl implements IInStockinFinishService { @Autowired private InStockinFinishMapper inStockinFinishMapper; /** * 查询历史入库单据主信息 - * + * * @param stockinGuid 历史入库单据主信息主键 * @return 历史入库单据主信息 */ @@ -33,7 +35,7 @@ public class InStockinFinishServiceImpl implements IInStockinFinishService /** * 查询历史入库单据主信息列表 - * + * * @param inStockinFinish 历史入库单据主信息 * @return 历史入库单据主信息 */ @@ -45,7 +47,7 @@ public class InStockinFinishServiceImpl implements IInStockinFinishService /** * 新增历史入库单据主信息 - * + * * @param inStockinFinish 历史入库单据主信息 * @return 结果 */ @@ -57,7 +59,7 @@ public class InStockinFinishServiceImpl implements IInStockinFinishService /** * 修改历史入库单据主信息 - * + * * @param inStockinFinish 历史入库单据主信息 * @return 结果 */ @@ -69,7 +71,7 @@ public class InStockinFinishServiceImpl implements IInStockinFinishService /** * 批量删除历史入库单据主信息 - * + * * @param stockinGuids 需要删除的历史入库单据主信息主键 * @return 结果 */ @@ -81,7 +83,7 @@ public class InStockinFinishServiceImpl implements IInStockinFinishService /** * 删除历史入库单据主信息信息 - * + * * @param stockinGuid 历史入库单据主信息主键 * @return 结果 */ @@ -90,4 +92,9 @@ public class InStockinFinishServiceImpl implements IInStockinFinishService { return inStockinFinishMapper.deleteInStockinFinishByStockinGuid(stockinGuid); } + + @Override + public List selectInStockinFinishListByInStockin(InStockin inStockin) { + return inStockinFinishMapper.selectInStockinFinishListByInStockin(inStockin); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/domain/MydoJob.java b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/domain/MydoJob.java index 6490afb..7e3087f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/domain/MydoJob.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/domain/MydoJob.java @@ -46,6 +46,8 @@ public class MydoJob /** 部门ID */ @Excel(name = "部门ID") private String departmentId; + @Excel(name = "部门") + private String departmentName; /** 托盘码 */ @Excel(name = "托盘码") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/receive/stockin/controller/ReceiveStockinController.java b/ruoyi-admin/src/main/java/com/ruoyi/receive/stockin/controller/ReceiveStockinController.java index f741f39..0d19fd4 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/receive/stockin/controller/ReceiveStockinController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/receive/stockin/controller/ReceiveStockinController.java @@ -1,15 +1,18 @@ package com.ruoyi.receive.stockin.controller; import java.io.IOException; +import java.util.ArrayList; import java.util.List; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import cn.hutool.core.convert.Convert; import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.receive.stockin.domain.vo.ReceiveProductVo; import com.ruoyi.receive.stockin.domain.vo.ReceiveStockCreateInVo; import com.ruoyi.receive.stockin.domain.vo.ReceiveStockQualityInsVo; import com.ruoyi.receive.stockin.domain.vo.ReceiveStockVo; +import com.ruoyi.receive.stockinfinish.service.IReceiveStockinFinishService; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; @@ -36,6 +39,8 @@ public class ReceiveStockinController extends BaseController { @Autowired private IReceiveStockinService receiveStockinService; + @Autowired + private IReceiveStockinFinishService receiveStockinFinishService; /** * 查询收货单据列表 @@ -45,7 +50,13 @@ public class ReceiveStockinController extends BaseController public TableDataInfo list(ReceiveStockin receiveStockin) { startPage(); - List list = receiveStockinService.selectReceiveStockinList(receiveStockin); + List list = new ArrayList<>() ; + if (Convert.toInt(receiveStockin.getStatus())<1){ + list = receiveStockinService.selectReceiveStockinList(receiveStockin); + }else { + list = receiveStockinFinishService.selectReceiveStockinList(receiveStockin); + } + return getDataTable(list); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/receive/stockin/domain/ReceiveStockin.java b/ruoyi-admin/src/main/java/com/ruoyi/receive/stockin/domain/ReceiveStockin.java index a5b5962..9ec21d5 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/receive/stockin/domain/ReceiveStockin.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/receive/stockin/domain/ReceiveStockin.java @@ -37,6 +37,8 @@ public class ReceiveStockin extends BaseEntity /** 创建人 */ @Excel(name = "创建人") private String createManId; + @Excel(name = "创建人") + private String createManName; /** 单据状态 */ @Excel(name = "单据状态") @@ -45,6 +47,8 @@ public class ReceiveStockin extends BaseEntity /** 仓库ID */ @Excel(name = "仓库ID") private String warehouseId; + @Excel(name = "仓库名称") + private String warehouseName; /** 备用字段5 */ @Excel(name = "备用字段5") @@ -81,6 +85,8 @@ public class ReceiveStockin extends BaseEntity /** 部门编码 */ @Excel(name = "部门编码") private String departmentNo; + @Excel(name = "部门") + private String departmentName; /** 客户编码 */ @Excel(name = "客户编码") @@ -93,7 +99,40 @@ public class ReceiveStockin extends BaseEntity /** 供应商编码 */ @Excel(name = "供应商编码") private String supplierNo; + @Excel(name = "供应商名称") + private String supplierName; + public String getCreateManName() { + return createManName; + } + + public void setCreateManName(String createManName) { + this.createManName = createManName; + } + + public String getDepartmentName() { + return departmentName; + } + + public void setDepartmentName(String departmentName) { + this.departmentName = departmentName; + } + + public String getSupplierName() { + return supplierName; + } + + public void setSupplierName(String supplierName) { + this.supplierName = supplierName; + } + + public String getWarehouseName() { + return warehouseName; + } + + public void setWarehouseName(String warehouseName) { + this.warehouseName = warehouseName; + } public void setStockinGuid(String stockinGuid) { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/receive/stockin/service/impl/ReceiveStockinServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/receive/stockin/service/impl/ReceiveStockinServiceImpl.java index ffbdabd..3c3d73c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/receive/stockin/service/impl/ReceiveStockinServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/receive/stockin/service/impl/ReceiveStockinServiceImpl.java @@ -102,6 +102,7 @@ public class ReceiveStockinServiceImpl implements IReceiveStockinService receiveStockin.setStockSource("1"); //receiveStockin.setSpare1(receiveStockVo.getBatchId()); receiveStockin.setCreateManId(Convert.toStr(SecurityUtils.getUserId())); + receiveStockin.setDepartmentNo(Convert.toStr(SecurityUtils.getDeptId())); receiveStockin.setStockinId(iBasJobIdService.getJobId("RED")); receiveStockin.setStatus("0"); receiveStockinMapper.insertReceiveStockin(receiveStockin); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/receive/stockindetail/controller/ReceiveStockinDetailController.java b/ruoyi-admin/src/main/java/com/ruoyi/receive/stockindetail/controller/ReceiveStockinDetailController.java index d0a3dc7..79778b3 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/receive/stockindetail/controller/ReceiveStockinDetailController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/receive/stockindetail/controller/ReceiveStockinDetailController.java @@ -1,9 +1,12 @@ package com.ruoyi.receive.stockindetail.controller; +import java.util.ArrayList; import java.util.List; import javax.servlet.http.HttpServletResponse; +import cn.hutool.core.convert.Convert; import com.ruoyi.receive.stockin.domain.vo.ReceiveStockQualityInsVo; +import com.ruoyi.receive.stockindetailfinish.service.IReceiveStockinDetailFinishService; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -35,6 +38,8 @@ public class ReceiveStockinDetailController extends BaseController { @Autowired private IReceiveStockinDetailService receiveStockinDetailService; + @Autowired + private IReceiveStockinDetailFinishService receiveStockinDetailFinishService; /** * 查询收货单据子单列表 @@ -44,7 +49,12 @@ public class ReceiveStockinDetailController extends BaseController public TableDataInfo list(ReceiveStockinDetail receiveStockinDetail) { startPage(); - List list = receiveStockinDetailService.selectReceiveStockinDetailList(receiveStockinDetail); + List list = new ArrayList<>(); + if (Convert.toInt(receiveStockinDetail.getStatus())<1){ + list = receiveStockinDetailService.selectReceiveStockinDetailList(receiveStockinDetail); + }else { + list =receiveStockinDetailFinishService.selectReceiveStockinDetailList(receiveStockinDetail); + } return getDataTable(list); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/receive/stockindetail/domain/ReceiveStockinDetail.java b/ruoyi-admin/src/main/java/com/ruoyi/receive/stockindetail/domain/ReceiveStockinDetail.java index 4fd91e6..8f53482 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/receive/stockindetail/domain/ReceiveStockinDetail.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/receive/stockindetail/domain/ReceiveStockinDetail.java @@ -126,5 +126,5 @@ public class ReceiveStockinDetail extends BaseEntity @Excel(name = "备用字段6") private String spare6; - + private String status; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/receive/stockindetailfinish/mapper/ReceiveStockinDetailFinishMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/receive/stockindetailfinish/mapper/ReceiveStockinDetailFinishMapper.java index 06d7e97..a1a5013 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/receive/stockindetailfinish/mapper/ReceiveStockinDetailFinishMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/receive/stockindetailfinish/mapper/ReceiveStockinDetailFinishMapper.java @@ -1,19 +1,21 @@ package com.ruoyi.receive.stockindetailfinish.mapper; import java.util.List; + +import com.ruoyi.receive.stockindetail.domain.ReceiveStockinDetail; import com.ruoyi.receive.stockindetailfinish.domain.ReceiveStockinDetailFinish; /** * 历史接收单据子信息Mapper接口 - * + * * @author ruoyi * @date 2025-05-28 */ -public interface ReceiveStockinDetailFinishMapper +public interface ReceiveStockinDetailFinishMapper { /** * 查询历史接收单据子信息 - * + * * @param stockinDetailId 历史接收单据子信息主键 * @return 历史接收单据子信息 */ @@ -21,7 +23,7 @@ public interface ReceiveStockinDetailFinishMapper /** * 查询历史接收单据子信息列表 - * + * * @param receiveStockinDetailFinish 历史接收单据子信息 * @return 历史接收单据子信息集合 */ @@ -29,7 +31,7 @@ public interface ReceiveStockinDetailFinishMapper /** * 新增历史接收单据子信息 - * + * * @param receiveStockinDetailFinish 历史接收单据子信息 * @return 结果 */ @@ -37,7 +39,7 @@ public interface ReceiveStockinDetailFinishMapper /** * 修改历史接收单据子信息 - * + * * @param receiveStockinDetailFinish 历史接收单据子信息 * @return 结果 */ @@ -45,7 +47,7 @@ public interface ReceiveStockinDetailFinishMapper /** * 删除历史接收单据子信息 - * + * * @param stockinDetailId 历史接收单据子信息主键 * @return 结果 */ @@ -53,9 +55,11 @@ public interface ReceiveStockinDetailFinishMapper /** * 批量删除历史接收单据子信息 - * + * * @param stockinDetailIds 需要删除的数据主键集合 * @return 结果 */ public int deleteReceiveStockinDetailFinishByStockinDetailIds(String[] stockinDetailIds); + + List selectReceiveStockinDetailList(ReceiveStockinDetail receiveStockinDetail); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/receive/stockindetailfinish/service/IReceiveStockinDetailFinishService.java b/ruoyi-admin/src/main/java/com/ruoyi/receive/stockindetailfinish/service/IReceiveStockinDetailFinishService.java index 519ba6a..a9d1279 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/receive/stockindetailfinish/service/IReceiveStockinDetailFinishService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/receive/stockindetailfinish/service/IReceiveStockinDetailFinishService.java @@ -1,19 +1,21 @@ package com.ruoyi.receive.stockindetailfinish.service; import java.util.List; + +import com.ruoyi.receive.stockindetail.domain.ReceiveStockinDetail; import com.ruoyi.receive.stockindetailfinish.domain.ReceiveStockinDetailFinish; /** * 历史接收单据子信息Service接口 - * + * * @author ruoyi * @date 2025-05-28 */ -public interface IReceiveStockinDetailFinishService +public interface IReceiveStockinDetailFinishService { /** * 查询历史接收单据子信息 - * + * * @param stockinDetailId 历史接收单据子信息主键 * @return 历史接收单据子信息 */ @@ -21,7 +23,7 @@ public interface IReceiveStockinDetailFinishService /** * 查询历史接收单据子信息列表 - * + * * @param receiveStockinDetailFinish 历史接收单据子信息 * @return 历史接收单据子信息集合 */ @@ -29,7 +31,7 @@ public interface IReceiveStockinDetailFinishService /** * 新增历史接收单据子信息 - * + * * @param receiveStockinDetailFinish 历史接收单据子信息 * @return 结果 */ @@ -37,7 +39,7 @@ public interface IReceiveStockinDetailFinishService /** * 修改历史接收单据子信息 - * + * * @param receiveStockinDetailFinish 历史接收单据子信息 * @return 结果 */ @@ -45,7 +47,7 @@ public interface IReceiveStockinDetailFinishService /** * 批量删除历史接收单据子信息 - * + * * @param stockinDetailIds 需要删除的历史接收单据子信息主键集合 * @return 结果 */ @@ -53,9 +55,11 @@ public interface IReceiveStockinDetailFinishService /** * 删除历史接收单据子信息信息 - * + * * @param stockinDetailId 历史接收单据子信息主键 * @return 结果 */ public int deleteReceiveStockinDetailFinishByStockinDetailId(String stockinDetailId); + + List selectReceiveStockinDetailList(ReceiveStockinDetail receiveStockinDetail); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/receive/stockindetailfinish/service/impl/ReceiveStockinDetailFinishServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/receive/stockindetailfinish/service/impl/ReceiveStockinDetailFinishServiceImpl.java index a67006c..f9c2cc9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/receive/stockindetailfinish/service/impl/ReceiveStockinDetailFinishServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/receive/stockindetailfinish/service/impl/ReceiveStockinDetailFinishServiceImpl.java @@ -1,6 +1,8 @@ package com.ruoyi.receive.stockindetailfinish.service.impl; import java.util.List; + +import com.ruoyi.receive.stockindetail.domain.ReceiveStockinDetail; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.receive.stockindetailfinish.mapper.ReceiveStockinDetailFinishMapper; @@ -9,19 +11,19 @@ import com.ruoyi.receive.stockindetailfinish.service.IReceiveStockinDetailFinish /** * 历史接收单据子信息Service业务层处理 - * + * * @author ruoyi * @date 2025-05-28 */ @Service -public class ReceiveStockinDetailFinishServiceImpl implements IReceiveStockinDetailFinishService +public class ReceiveStockinDetailFinishServiceImpl implements IReceiveStockinDetailFinishService { @Autowired private ReceiveStockinDetailFinishMapper receiveStockinDetailFinishMapper; /** * 查询历史接收单据子信息 - * + * * @param stockinDetailId 历史接收单据子信息主键 * @return 历史接收单据子信息 */ @@ -33,7 +35,7 @@ public class ReceiveStockinDetailFinishServiceImpl implements IReceiveStockinDet /** * 查询历史接收单据子信息列表 - * + * * @param receiveStockinDetailFinish 历史接收单据子信息 * @return 历史接收单据子信息 */ @@ -45,7 +47,7 @@ public class ReceiveStockinDetailFinishServiceImpl implements IReceiveStockinDet /** * 新增历史接收单据子信息 - * + * * @param receiveStockinDetailFinish 历史接收单据子信息 * @return 结果 */ @@ -57,7 +59,7 @@ public class ReceiveStockinDetailFinishServiceImpl implements IReceiveStockinDet /** * 修改历史接收单据子信息 - * + * * @param receiveStockinDetailFinish 历史接收单据子信息 * @return 结果 */ @@ -69,7 +71,7 @@ public class ReceiveStockinDetailFinishServiceImpl implements IReceiveStockinDet /** * 批量删除历史接收单据子信息 - * + * * @param stockinDetailIds 需要删除的历史接收单据子信息主键 * @return 结果 */ @@ -81,7 +83,7 @@ public class ReceiveStockinDetailFinishServiceImpl implements IReceiveStockinDet /** * 删除历史接收单据子信息信息 - * + * * @param stockinDetailId 历史接收单据子信息主键 * @return 结果 */ @@ -90,4 +92,9 @@ public class ReceiveStockinDetailFinishServiceImpl implements IReceiveStockinDet { return receiveStockinDetailFinishMapper.deleteReceiveStockinDetailFinishByStockinDetailId(stockinDetailId); } + + @Override + public List selectReceiveStockinDetailList(ReceiveStockinDetail receiveStockinDetail) { + return receiveStockinDetailFinishMapper.selectReceiveStockinDetailList(receiveStockinDetail); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/receive/stockinfinish/mapper/ReceiveStockinFinishMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/receive/stockinfinish/mapper/ReceiveStockinFinishMapper.java index 12b1733..9d7b3a2 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/receive/stockinfinish/mapper/ReceiveStockinFinishMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/receive/stockinfinish/mapper/ReceiveStockinFinishMapper.java @@ -1,19 +1,21 @@ package com.ruoyi.receive.stockinfinish.mapper; import java.util.List; + +import com.ruoyi.receive.stockin.domain.ReceiveStockin; import com.ruoyi.receive.stockinfinish.domain.ReceiveStockinFinish; /** * 历史接收单据主信息Mapper接口 - * + * * @author ruoyi * @date 2025-05-28 */ -public interface ReceiveStockinFinishMapper +public interface ReceiveStockinFinishMapper { /** * 查询历史接收单据主信息 - * + * * @param stockinGuid 历史接收单据主信息主键 * @return 历史接收单据主信息 */ @@ -21,7 +23,7 @@ public interface ReceiveStockinFinishMapper /** * 查询历史接收单据主信息列表 - * + * * @param receiveStockinFinish 历史接收单据主信息 * @return 历史接收单据主信息集合 */ @@ -29,7 +31,7 @@ public interface ReceiveStockinFinishMapper /** * 新增历史接收单据主信息 - * + * * @param receiveStockinFinish 历史接收单据主信息 * @return 结果 */ @@ -37,7 +39,7 @@ public interface ReceiveStockinFinishMapper /** * 修改历史接收单据主信息 - * + * * @param receiveStockinFinish 历史接收单据主信息 * @return 结果 */ @@ -45,7 +47,7 @@ public interface ReceiveStockinFinishMapper /** * 删除历史接收单据主信息 - * + * * @param stockinGuid 历史接收单据主信息主键 * @return 结果 */ @@ -53,9 +55,11 @@ public interface ReceiveStockinFinishMapper /** * 批量删除历史接收单据主信息 - * + * * @param stockinGuids 需要删除的数据主键集合 * @return 结果 */ public int deleteReceiveStockinFinishByStockinGuids(String[] stockinGuids); + + List selectReceiveStockinList(ReceiveStockin receiveStockin); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/receive/stockinfinish/service/IReceiveStockinFinishService.java b/ruoyi-admin/src/main/java/com/ruoyi/receive/stockinfinish/service/IReceiveStockinFinishService.java index 62ab345..b8c78dc 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/receive/stockinfinish/service/IReceiveStockinFinishService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/receive/stockinfinish/service/IReceiveStockinFinishService.java @@ -1,19 +1,21 @@ package com.ruoyi.receive.stockinfinish.service; import java.util.List; + +import com.ruoyi.receive.stockin.domain.ReceiveStockin; import com.ruoyi.receive.stockinfinish.domain.ReceiveStockinFinish; /** * 历史接收单据主信息Service接口 - * + * * @author ruoyi * @date 2025-05-28 */ -public interface IReceiveStockinFinishService +public interface IReceiveStockinFinishService { /** * 查询历史接收单据主信息 - * + * * @param stockinGuid 历史接收单据主信息主键 * @return 历史接收单据主信息 */ @@ -21,7 +23,7 @@ public interface IReceiveStockinFinishService /** * 查询历史接收单据主信息列表 - * + * * @param receiveStockinFinish 历史接收单据主信息 * @return 历史接收单据主信息集合 */ @@ -29,7 +31,7 @@ public interface IReceiveStockinFinishService /** * 新增历史接收单据主信息 - * + * * @param receiveStockinFinish 历史接收单据主信息 * @return 结果 */ @@ -37,7 +39,7 @@ public interface IReceiveStockinFinishService /** * 修改历史接收单据主信息 - * + * * @param receiveStockinFinish 历史接收单据主信息 * @return 结果 */ @@ -45,7 +47,7 @@ public interface IReceiveStockinFinishService /** * 批量删除历史接收单据主信息 - * + * * @param stockinGuids 需要删除的历史接收单据主信息主键集合 * @return 结果 */ @@ -53,9 +55,11 @@ public interface IReceiveStockinFinishService /** * 删除历史接收单据主信息信息 - * + * * @param stockinGuid 历史接收单据主信息主键 * @return 结果 */ public int deleteReceiveStockinFinishByStockinGuid(String stockinGuid); + + List selectReceiveStockinList(ReceiveStockin receiveStockin); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/receive/stockinfinish/service/impl/ReceiveStockinFinishServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/receive/stockinfinish/service/impl/ReceiveStockinFinishServiceImpl.java index b5a5e7c..9b7aa29 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/receive/stockinfinish/service/impl/ReceiveStockinFinishServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/receive/stockinfinish/service/impl/ReceiveStockinFinishServiceImpl.java @@ -1,6 +1,8 @@ package com.ruoyi.receive.stockinfinish.service.impl; import java.util.List; + +import com.ruoyi.receive.stockin.domain.ReceiveStockin; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.receive.stockinfinish.mapper.ReceiveStockinFinishMapper; @@ -9,19 +11,19 @@ import com.ruoyi.receive.stockinfinish.service.IReceiveStockinFinishService; /** * 历史接收单据主信息Service业务层处理 - * + * * @author ruoyi * @date 2025-05-28 */ @Service -public class ReceiveStockinFinishServiceImpl implements IReceiveStockinFinishService +public class ReceiveStockinFinishServiceImpl implements IReceiveStockinFinishService { @Autowired private ReceiveStockinFinishMapper receiveStockinFinishMapper; /** * 查询历史接收单据主信息 - * + * * @param stockinGuid 历史接收单据主信息主键 * @return 历史接收单据主信息 */ @@ -33,7 +35,7 @@ public class ReceiveStockinFinishServiceImpl implements IReceiveStockinFinishSer /** * 查询历史接收单据主信息列表 - * + * * @param receiveStockinFinish 历史接收单据主信息 * @return 历史接收单据主信息 */ @@ -45,7 +47,7 @@ public class ReceiveStockinFinishServiceImpl implements IReceiveStockinFinishSer /** * 新增历史接收单据主信息 - * + * * @param receiveStockinFinish 历史接收单据主信息 * @return 结果 */ @@ -57,7 +59,7 @@ public class ReceiveStockinFinishServiceImpl implements IReceiveStockinFinishSer /** * 修改历史接收单据主信息 - * + * * @param receiveStockinFinish 历史接收单据主信息 * @return 结果 */ @@ -69,7 +71,7 @@ public class ReceiveStockinFinishServiceImpl implements IReceiveStockinFinishSer /** * 批量删除历史接收单据主信息 - * + * * @param stockinGuids 需要删除的历史接收单据主信息主键 * @return 结果 */ @@ -81,7 +83,7 @@ public class ReceiveStockinFinishServiceImpl implements IReceiveStockinFinishSer /** * 删除历史接收单据主信息信息 - * + * * @param stockinGuid 历史接收单据主信息主键 * @return 结果 */ @@ -90,4 +92,9 @@ public class ReceiveStockinFinishServiceImpl implements IReceiveStockinFinishSer { return receiveStockinFinishMapper.deleteReceiveStockinFinishByStockinGuid(stockinGuid); } + + @Override + public List selectReceiveStockinList(ReceiveStockin receiveStockin) { + return receiveStockinFinishMapper.selectReceiveStockinList(receiveStockin); + } } diff --git a/ruoyi-admin/src/main/resources/i18n/messages_en_US.properties b/ruoyi-admin/src/main/resources/i18n/messages_en_US.properties new file mode 100644 index 0000000..1b49085 --- /dev/null +++ b/ruoyi-admin/src/main/resources/i18n/messages_en_US.properties @@ -0,0 +1,38 @@ +#???? +not.null=* ???? +user.jcaptcha.error=????? +user.jcaptcha.expire=?????? +user.not.exists=?????/???? +user.password.not.match=?????/???? +user.password.retry.limit.count=??????{0}? +user.password.retry.limit.exceed=??????{0}??????{1}?? +user.password.delete=???????????? +user.blocked=???????????? +role.blocked=???????????? +login.blocked=??????IP????????? +user.logout.success=???? + +length.not.valid=?????{min}?{max}????? + +user.username.not.valid=* 2?20????????????????????????? +user.password.not.valid=* 5-50??? + +user.email.not.valid=?????? +user.mobile.phone.number.not.valid=??????? +user.login.success=???? +user.register.success=???? +user.notfound=????? +user.forcelogout=????????????? +user.unknown.error=?????????? + +##?????? +upload.exceed.maxSize=?????????????????
???????????{0}MB? +upload.filename.exceed.length=????????{0}??? + +##?? +no.permission=??????????????????? [{0}] +no.create.permission=????????????????????? [{0}] +no.update.permission=????????????????????? [{0}] +no.delete.permission=????????????????????? [{0}] +no.export.permission=????????????????????? [{0}] +no.view.permission=????????????????????? [{0}] diff --git a/ruoyi-admin/src/main/resources/i18n/messages_zh_CN.properties b/ruoyi-admin/src/main/resources/i18n/messages_zh_CN.properties new file mode 100644 index 0000000..1b49085 --- /dev/null +++ b/ruoyi-admin/src/main/resources/i18n/messages_zh_CN.properties @@ -0,0 +1,38 @@ +#???? +not.null=* ???? +user.jcaptcha.error=????? +user.jcaptcha.expire=?????? +user.not.exists=?????/???? +user.password.not.match=?????/???? +user.password.retry.limit.count=??????{0}? +user.password.retry.limit.exceed=??????{0}??????{1}?? +user.password.delete=???????????? +user.blocked=???????????? +role.blocked=???????????? +login.blocked=??????IP????????? +user.logout.success=???? + +length.not.valid=?????{min}?{max}????? + +user.username.not.valid=* 2?20????????????????????????? +user.password.not.valid=* 5-50??? + +user.email.not.valid=?????? +user.mobile.phone.number.not.valid=??????? +user.login.success=???? +user.register.success=???? +user.notfound=????? +user.forcelogout=????????????? +user.unknown.error=?????????? + +##?????? +upload.exceed.maxSize=?????????????????
???????????{0}MB? +upload.filename.exceed.length=????????{0}??? + +##?? +no.permission=??????????????????? [{0}] +no.create.permission=????????????????????? [{0}] +no.update.permission=????????????????????? [{0}] +no.delete.permission=????????????????????? [{0}] +no.export.permission=????????????????????? [{0}] +no.view.permission=????????????????????? [{0}] diff --git a/ruoyi-admin/src/main/resources/mapper/check/CheckDifferenceRecordMapper.xml b/ruoyi-admin/src/main/resources/mapper/check/CheckDifferenceRecordMapper.xml new file mode 100644 index 0000000..0e3f174 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/check/CheckDifferenceRecordMapper.xml @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + + + + + + + + + + select check_guid, check_stock_detail_id, stock_id, tray_code, cargo_space_id, product_id, lot_no, supplier, customer, old_quantity, new_quantity, record_type, create_time, product_guid from check_difference_record + + + + + + + + insert into check_difference_record + + check_guid, + check_stock_detail_id, + stock_id, + tray_code, + cargo_space_id, + product_id, + lot_no, + supplier, + customer, + old_quantity, + new_quantity, + record_type, + create_time, + product_guid, + + + #{checkGuid}, + #{checkStockDetailId}, + #{stockId}, + #{trayCode}, + #{cargoSpaceId}, + #{productId}, + #{lotNo}, + #{supplier}, + #{customer}, + #{oldQuantity}, + #{newQuantity}, + #{recordType}, + #{createTime}, + #{productGuid}, + + + + + update check_difference_record + + check_stock_detail_id = #{checkStockDetailId}, + stock_id = #{stockId}, + tray_code = #{trayCode}, + cargo_space_id = #{cargoSpaceId}, + product_id = #{productId}, + lot_no = #{lotNo}, + supplier = #{supplier}, + customer = #{customer}, + old_quantity = #{oldQuantity}, + new_quantity = #{newQuantity}, + record_type = #{recordType}, + create_time = #{createTime}, + product_guid = #{productGuid}, + + where check_guid = #{checkGuid} + + + + delete from check_difference_record where check_guid = #{checkGuid} + + + + delete from check_difference_record where check_guid in + + #{checkGuid} + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mapper/in/InStockinDetailFinishMapper.xml b/ruoyi-admin/src/main/resources/mapper/in/InStockinDetailFinishMapper.xml index ddd66c6..2d5484f 100644 --- a/ruoyi-admin/src/main/resources/mapper/in/InStockinDetailFinishMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/in/InStockinDetailFinishMapper.xml @@ -3,7 +3,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -36,14 +36,45 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select stockin_detail_id, stockin_guid, stockin_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 in_stockin_detail_finish - + + insert into in_stockin_detail_finish @@ -189,9 +254,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from in_stockin_detail_finish where stockin_detail_id in + delete from in_stockin_detail_finish where stockin_detail_id in #{stockinDetailId} - \ No newline at end of file + diff --git a/ruoyi-admin/src/main/resources/mapper/in/InStockinFinishMapper.xml b/ruoyi-admin/src/main/resources/mapper/in/InStockinFinishMapper.xml index 77a9ec3..a2aea7b 100644 --- a/ruoyi-admin/src/main/resources/mapper/in/InStockinFinishMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/in/InStockinFinishMapper.xml @@ -3,7 +3,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -26,37 +26,112 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + + + + + + + + + + + + + + + + + + + + + + - select stockin_guid, stockin_id, in_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 in_stockin_finish - + select is2.stockin_guid, + is2.stockin_id, + is2.in_type, + is2.create_date, + is2.create_man_id, + is2.status, + is2.warehouse_id, + is2.finish_date, + is2.erp_bill, + is2.stock_source, + is2.department_no, + is2.customer_no, + is2.class_no, + is2.supplier_no, + is2.spare1, + is2.spare2, + is2.spare4, + is2.spare3, + is2.spare5, + bw.warehouse_name, + bs.supplier_name, + sd.dept_name , + su.user_name + from in_stockin_finish is2 + left join bas_warehouse bw on is2.warehouse_id = bw.warehouse_id + left join bas_supplier bs on bs.supplier_no = is2.supplier_no + left join sys_dept sd on is2.department_no = sd.dept_id + left join sys_user su on su.user_id = is2.create_man_id - + + @@ -135,9 +210,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from in_stockin_finish where stockin_guid in + delete from in_stockin_finish where stockin_guid in #{stockinGuid} - \ No newline at end of file + diff --git a/ruoyi-admin/src/main/resources/mapper/in/InStockinMapper.xml b/ruoyi-admin/src/main/resources/mapper/in/InStockinMapper.xml index 07ff909..84cbd12 100644 --- a/ruoyi-admin/src/main/resources/mapper/in/InStockinMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/in/InStockinMapper.xml @@ -10,15 +10,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + @@ -27,36 +31,63 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select stockin_guid, stockin_id, in_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, spare4, spare3, spare5 from in_stockin + select is2.stockin_guid, + is2.stockin_id, + is2.in_type, + is2.create_date, + is2.create_man_id, + is2.status, + is2.warehouse_id, + is2.finish_date, + is2.erp_bill, + is2.stock_source, + is2.department_no, + is2.customer_no, + is2.class_no, + is2.supplier_no, + is2.spare1, + is2.spare2, + is2.spare4, + is2.spare3, + is2.spare5, + bw.warehouse_name, + bs.supplier_name, + sd.dept_name , + su.user_name + from in_stockin is2 + left join bas_warehouse bw on is2.warehouse_id = bw.warehouse_id + left join bas_supplier bs on bs.supplier_no = is2.supplier_no + left join sys_dept sd on is2.department_no = sd.dept_id + left join sys_user su on su.user_id = is2.create_man_id diff --git a/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml b/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml index b7f50b7..033f30f 100644 --- a/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml @@ -35,6 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -45,13 +46,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" mj.exit_id, mj.class_id, mj.warehouse_id, mj.fault_flag, bs.supplier_name as supplier_name, bc.customer_name as customer_name, bcs.cargo_space_name as cargo_space_name, bcst.cargo_space_name as target_cargo_space_name, - bw.warehouse_name as warehouse_name + bw.warehouse_name as warehouse_name,sd.dept_name from mydo_job mj left join bas_supplier bs on mj.supplier_id = bs.id left join bas_customer bc on mj.customer_id = bc.id left join bas_cargo_space bcs on mj.cargo_space_id = bcs.cargo_space_id left join bas_cargo_space bcst on mj.target_cargo_space_id = bcst.cargo_space_id left join bas_warehouse bw on mj.warehouse_id = bw.warehouse_id + left join sys_dept sd on mj.department_id = sd.dept_id diff --git a/ruoyi-admin/src/main/resources/mapper/receive/ReceiveStockinDetailFinishMapper.xml b/ruoyi-admin/src/main/resources/mapper/receive/ReceiveStockinDetailFinishMapper.xml index aa16daa..4faa1e3 100644 --- a/ruoyi-admin/src/main/resources/mapper/receive/ReceiveStockinDetailFinishMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/receive/ReceiveStockinDetailFinishMapper.xml @@ -3,7 +3,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -33,6 +33,35 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select stockin_detail_id, stockin_guid, stockin_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 from receive_stockin_detail_finish @@ -40,7 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + + insert into receive_stockin_detail_finish @@ -174,9 +234,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from receive_stockin_detail_finish where stockin_detail_id in + delete from receive_stockin_detail_finish where stockin_detail_id in #{stockinDetailId} - \ No newline at end of file + diff --git a/ruoyi-admin/src/main/resources/mapper/receive/ReceiveStockinFinishMapper.xml b/ruoyi-admin/src/main/resources/mapper/receive/ReceiveStockinFinishMapper.xml index 2fc97d4..a5aa259 100644 --- a/ruoyi-admin/src/main/resources/mapper/receive/ReceiveStockinFinishMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/receive/ReceiveStockinFinishMapper.xml @@ -3,7 +3,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -25,39 +25,115 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + + + + + + + + + + + + + + + + + + + + + - select stockin_guid, stockin_id, in_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 receive_stockin_finish + select + rs.stockin_guid , + rs.stockin_id , + rs.in_type , + rs.create_date , + rs.create_man_id , + rs.status , + rs.warehouse_id , + bw.warehouse_name , + rs.spare5 , + rs.spare4 , + rs.spare3 , + rs.finish_date , + rs.spare2 , + rs.spare1, + rs.erp_bill , + rs.stock_source, + rs.department_no, + rs.customer_no, + rs.class_no, + rs.supplier_no, + bs.supplier_name, + sd.dept_name, + su.user_name + from receive_stockin_finish rs + left join bas_warehouse bw on rs.warehouse_id = bw.warehouse_id + left join bas_supplier bs on rs.supplier_no = bs.supplier_no + left join sys_dept sd on rs.department_no = sd.dept_id + left join sys_user su on su.user_id = rs.create_man_id - + + insert into receive_stockin_finish @@ -135,9 +211,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from receive_stockin_finish where stockin_guid in + delete from receive_stockin_finish where stockin_guid in #{stockinGuid} - \ No newline at end of file + diff --git a/ruoyi-admin/src/main/resources/mapper/receive/ReceiveStockinMapper.xml b/ruoyi-admin/src/main/resources/mapper/receive/ReceiveStockinMapper.xml index 35d2419..2e9ff07 100644 --- a/ruoyi-admin/src/main/resources/mapper/receive/ReceiveStockinMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/receive/ReceiveStockinMapper.xml @@ -10,8 +10,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + @@ -21,42 +23,73 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + - select stockin_guid, stockin_id, in_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 receive_stockin + select + rs.stockin_guid , + rs.stockin_id , + rs.in_type , + rs.create_date , + rs.create_man_id , + rs.status , + rs.warehouse_id , + bw.warehouse_name , + rs.spare5 , + rs.spare4 , + rs.spare3 , + rs.finish_date , + rs.spare2 , + rs.spare1, + rs.erp_bill , + rs.stock_source, + rs.department_no, + rs.customer_no, + rs.class_no, + rs.supplier_no, + bs.supplier_name, + sd.dept_name, + su.user_name + from receive_stockin rs + left join bas_warehouse bw on rs.warehouse_id = bw.warehouse_id + left join bas_supplier bs on rs.supplier_no = bs.supplier_no + left join sys_dept sd on rs.department_no = sd.dept_id + left join sys_user su on su.user_id = rs.create_man_id + diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/MessageUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/MessageUtils.java index 7dac75a..da24f0b 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/MessageUtils.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/MessageUtils.java @@ -4,9 +4,12 @@ import org.springframework.context.MessageSource; import org.springframework.context.i18n.LocaleContextHolder; import com.ruoyi.common.utils.spring.SpringUtils; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + /** * 获取i18n资源文件 - * + * * @author ruoyi */ public class MessageUtils @@ -23,4 +26,30 @@ public class MessageUtils MessageSource messageSource = SpringUtils.getBean(MessageSource.class); return messageSource.getMessage(code, args, LocaleContextHolder.getLocale()); } + + /** + * 解析 ${}中括号中的值 + * + * @param input 包含 ${} 占位符的字符串 + * @return 解析后的值（如果国际化文件中不存在对应的value，则会返回Key） + */ + public static String parseMessage(String input) + { + // 匹配 ${} 占位符的正则表达式 + Pattern pattern = Pattern.compile("\\$\\{([^\\}]+)\\}"); + Matcher matcher = pattern.matcher(input); + StringBuffer result = new StringBuffer(); + // 逐个匹配并替换 ${} 中的值 + while (matcher.find()) + { + String key = matcher.group(1); // 匹配到的括号中的值 + // tag 国际化 + String replacement = MessageUtils.message(key); + // 替换占位符 + matcher.appendReplacement(result, replacement); + } + // 处理剩余部分 + matcher.appendTail(result); + return result.toString(); + } } diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java index a88bda6..989f988 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java @@ -24,6 +24,8 @@ import java.util.Set; import java.util.UUID; import java.util.stream.Collectors; import javax.servlet.http.HttpServletResponse; + +import com.ruoyi.common.utils.MessageUtils; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.RegExUtils; import org.apache.commons.lang3.reflect.FieldUtils; @@ -88,7 +90,7 @@ import com.ruoyi.common.utils.reflect.ReflectUtils; /** * Excel相关处理 - * + * * @author ruoyi */ public class ExcelUtil @@ -307,7 +309,7 @@ public class ExcelUtil /** * 对excel表单默认第一个索引名转换成list - * + * * @param is 输入流 * @return 转换后集合 */ @@ -318,7 +320,7 @@ public class ExcelUtil /** * 对excel表单默认第一个索引名转换成list - * + * * @param is 输入流 * @param titleNum 标题占用行数 * @return 转换后集合 @@ -344,7 +346,7 @@ public class ExcelUtil /** * 对excel表单指定表格索引名转换成list - * + * * @param sheetName 表格索引名 * @param titleNum 标题占用行数 * @param is 输入流 @@ -527,7 +529,7 @@ public class ExcelUtil /** * 对list数据源将其里面的数据导入到excel表单 - * + * * @param list 导出数据集合 * @param sheetName 工作表的名称 * @return 结果 @@ -539,7 +541,7 @@ public class ExcelUtil /** * 对list数据源将其里面的数据导入到excel表单 - * + * * @param list 导出数据集合 * @param sheetName 工作表的名称 * @param title 标题 @@ -553,7 +555,7 @@ public class ExcelUtil /** * 对list数据源将其里面的数据导入到excel表单 - * + * * @param response 返回数据 * @param list 导出数据集合 * @param sheetName 工作表的名称 @@ -566,7 +568,7 @@ public class ExcelUtil /** * 对list数据源将其里面的数据导入到excel表单 - * + * * @param response 返回数据 * @param list 导出数据集合 * @param sheetName 工作表的名称 @@ -583,7 +585,7 @@ public class ExcelUtil /** * 对list数据源将其里面的数据导入到excel表单 - * + * * @param sheetName 工作表的名称 * @return 结果 */ @@ -594,7 +596,7 @@ public class ExcelUtil /** * 对list数据源将其里面的数据导入到excel表单 - * + * * @param sheetName 工作表的名称 * @param title 标题 * @return 结果 @@ -607,7 +609,7 @@ public class ExcelUtil /** * 对list数据源将其里面的数据导入到excel表单 - * + * * @param sheetName 工作表的名称 * @return 结果 */ @@ -618,7 +620,7 @@ public class ExcelUtil /** * 对list数据源将其里面的数据导入到excel表单 - * + * * @param sheetName 工作表的名称 * @param title 标题 * @return 结果 @@ -633,7 +635,7 @@ public class ExcelUtil /** * 对list数据源将其里面的数据导入到excel表单 - * + * * @return 结果 */ public void exportExcel(HttpServletResponse response) @@ -655,7 +657,7 @@ public class ExcelUtil /** * 对list数据源将其里面的数据导入到excel表单 - * + * * @return 结果 */ public AjaxResult exportExcel() @@ -723,7 +725,7 @@ public class ExcelUtil /** * 填充excel数据 - * + * * @param index 序号 * @param row 单元格行 */ @@ -821,7 +823,7 @@ public class ExcelUtil /** * 创建表格样式 - * + * * @param wb 工作薄对象 * @return 样式列表 */ @@ -876,7 +878,7 @@ public class ExcelUtil /** * 根据Excel注解创建表格头样式 - * + * * @param wb 工作薄对象 * @return 自定义样式列表 */ @@ -912,7 +914,7 @@ public class ExcelUtil /** * 根据Excel注解创建表格列样式 - * + * * @param wb 工作薄对象 * @return 自定义样式列表 */ @@ -944,7 +946,7 @@ public class ExcelUtil /** * 根据Excel注解创建表格列样式 - * + * * @param styles 自定义样式列表 * @param field 属性列信息 * @param excel 注解信息 @@ -991,6 +993,8 @@ public class ExcelUtil Cell cell = row.createCell(column); // 写入列信息 cell.setCellValue(attr.name()); + // 国际化 + //cell.setCellValue(MessageUtils.parseMessage(attr.name())); setDataValidation(attr, row, column); cell.setCellStyle(styles.get(StringUtils.format("header_{}_{}", attr.headerColor(), attr.headerBackgroundColor()))); if (isSubList()) @@ -1007,7 +1011,7 @@ public class ExcelUtil /** * 设置单元格信息 - * + * * @param value 单元格值 * @param attr 注解相关 * @param cell 单元格信息 @@ -1193,7 +1197,7 @@ public class ExcelUtil /** * 设置 POI XSSFSheet 单元格提示或选择框 - * + * * @param sheet 表单 * @param textlist 下拉框显示的内容 * @param promptContent 提示内容 @@ -1230,7 +1234,7 @@ public class ExcelUtil /** * 设置某些列的值只能输入预制的数据,显示下拉框（兼容超出一定数量的下拉框）. - * + * * @param sheet 要设置的sheet. * @param textlist 下拉框显示的内容 * @param promptContent 提示内容 @@ -1282,7 +1286,7 @@ public class ExcelUtil /** * 解析导出值 0=男,1=女,2=未知 - * + * * @param propertyValue 参数值 * @param converterExp 翻译注解 * @param separator 分隔符 @@ -1319,7 +1323,7 @@ public class ExcelUtil /** * 反向解析值 男=0,女=1,未知=2 - * + * * @param propertyValue 参数值 * @param converterExp 翻译注解 * @param separator 分隔符 @@ -1356,7 +1360,7 @@ public class ExcelUtil /** * 解析字典值 - * + * * @param dictValue 字典值 * @param dictType 字典类型 * @param separator 分隔符 @@ -1369,7 +1373,7 @@ public class ExcelUtil /** * 反向解析值字典值 - * + * * @param dictLabel 字典标签 * @param dictType 字典类型 * @param separator 分隔符 @@ -1382,7 +1386,7 @@ public class ExcelUtil /** * 数据处理器 - * + * * @param value 数据值 * @param excel 数据注解 * @return @@ -1458,7 +1462,7 @@ public class ExcelUtil /** * 获取下载路径 - * + * * @param filename 文件名称 */ public String getAbsoluteFile(String filename) @@ -1474,7 +1478,7 @@ public class ExcelUtil /** * 获取bean中的属性值 - * + * * @param vo 实体对象 * @param field 字段 * @param excel 注解 @@ -1506,7 +1510,7 @@ public class ExcelUtil /** * 以类的属性的get方法方法形式获取值 - * + * * @param o * @param name * @return value @@ -1649,7 +1653,7 @@ public class ExcelUtil /** * 创建工作表 - * + * * @param sheetNo sheet数量 * @param index 序号 */ @@ -1666,7 +1670,7 @@ public class ExcelUtil /** * 获取单元格值 - * + * * @param row 获取的行 * @param column 获取单元格列号 * @return 单元格值 @@ -1726,7 +1730,7 @@ public class ExcelUtil /** * 判断是否是空行 - * + * * @param row 判断的行 * @return */ @@ -1807,7 +1811,7 @@ public class ExcelUtil /** * 格式化不同类型的日期对象 - * + * * @param dateFormat 日期格式 * @param val 被格式化的日期对象 * @return 格式化后的日期字符 @@ -1873,7 +1877,7 @@ public class ExcelUtil /** * 获取对象的子列表方法 - * + * * @param name 名称 * @param pojoClass 类对象 * @return 子列表方法 diff --git a/ruoyi-ui/src/api/check/difference.js b/ruoyi-ui/src/api/check/difference.js new file mode 100644 index 0000000..6ab8dea --- /dev/null +++ b/ruoyi-ui/src/api/check/difference.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询盘点差异列表 +export function listDifference(query) { + return request({ + url: '/check/difference/list', + method: 'get', + params: query + }) +} + +// 查询盘点差异详细 +export function getDifference(checkGuid) { + return request({ + url: '/check/difference/' + checkGuid, + method: 'get' + }) +} + +// 新增盘点差异 +export function addDifference(data) { + return request({ + url: '/check/difference', + method: 'post', + data: data + }) +} + +// 修改盘点差异 +export function updateDifference(data) { + return request({ + url: '/check/difference', + method: 'put', + data: data + }) +} + +// 删除盘点差异 +export function delDifference(checkGuid) { + return request({ + url: '/check/difference/' + checkGuid, + method: 'delete' + }) +} diff --git a/ruoyi-ui/src/api/in/stockInDetail.js b/ruoyi-ui/src/api/in/stockInDetail.js index 9bfe494..f193502 100644 --- a/ruoyi-ui/src/api/in/stockInDetail.js +++ b/ruoyi-ui/src/api/in/stockInDetail.js @@ -42,3 +42,11 @@ export function delStockInDetail(stockinDetailId) { method: 'delete' }) } + +export function barcodePrinting(data) { + return request({ + url: '/in/stockInDetail/barcodePrinting', + method: 'post', + data:data + }) +} diff --git a/ruoyi-ui/src/views/check/create/index.vue b/ruoyi-ui/src/views/check/create/index.vue new file mode 100644 index 0000000..73e219a --- /dev/null +++ b/ruoyi-ui/src/views/check/create/index.vue @@ -0,0 +1,295 @@ + + + + diff --git a/ruoyi-ui/src/views/check/difference/index.vue b/ruoyi-ui/src/views/check/difference/index.vue new file mode 100644 index 0000000..133d082 --- /dev/null +++ b/ruoyi-ui/src/views/check/difference/index.vue @@ -0,0 +1,389 @@ + + + diff --git a/ruoyi-ui/src/views/in/job/index.vue b/ruoyi-ui/src/views/in/job/index.vue index 2e66db3..ff70309 100644 --- a/ruoyi-ui/src/views/in/job/index.vue +++ b/ruoyi-ui/src/views/in/job/index.vue @@ -263,7 +263,7 @@ - + @@ -389,7 +389,7 @@ export default { pageNum: 1, pageSize: 10, jobId: null, - status: 1, + status: '1', onLineType: null, taskNo: null, supplierId: null, @@ -404,7 +404,7 @@ export default { workshopId: null, priority: null, executionPhase: null, - inOrOut: null, + inOrOut: '1', createTime: null, startTime: null, finishTime: null, diff --git a/ruoyi-ui/src/views/in/receive/add/index.vue b/ruoyi-ui/src/views/in/receive/add/index.vue index 2298d69..b71c1f1 100644 --- a/ruoyi-ui/src/views/in/receive/add/index.vue +++ b/ruoyi-ui/src/views/in/receive/add/index.vue @@ -23,9 +23,9 @@ @@ -120,7 +120,7 @@ icon="el-icon-delete" @click="handleDeleteProduct(scope.$index)" >{{ $t('receiveStockinAdd.delete') }} - + @@ -193,6 +193,7 @@ import {addStockin} from "@/api/receive/stockin"; import {listBasProduct} from "@/api/bas/BasProduct"; import {listBasSupplier} from "@/api/bas/BasSupplier"; import { getToken } from "@/utils/auth" +import {listWarehouse} from "@/api/bas/warehouse" export default { @@ -221,10 +222,7 @@ export default { }, // 仓库选项 - warehouseOptions: [ - {warehouseId: 1, warehouseName: "主仓库"}, - {warehouseId: 2, warehouseName: "次仓库"} - ], + warehouseOptions: [], // 供应商选项 supplierOptions: [], // 物料列表 @@ -266,7 +264,7 @@ export default { }; }, created() { - //this.getWarehouseList(); + this.getWarehouseList(); this.getSupplierList(); console.log(this.supplierOptions) }, diff --git a/ruoyi-ui/src/views/in/receive/index.vue b/ruoyi-ui/src/views/in/receive/index.vue index 0b1ef3d..5c433bd 100644 --- a/ruoyi-ui/src/views/in/receive/index.vue +++ b/ruoyi-ui/src/views/in/receive/index.vue @@ -125,12 +125,34 @@ /> - + @change="handleQuery" + > + + + + + + + 搜索 @@ -194,9 +216,13 @@ - - - + + + + + @@ -205,10 +231,10 @@ --> - + - + - + + + @@ -336,11 +366,18 @@ diff --git a/ruoyi-ui/src/views/in/stockIn/index.vue b/ruoyi-ui/src/views/in/stockIn/index.vue index 72e911a..b3622c2 100644 --- a/ruoyi-ui/src/views/in/stockIn/index.vue +++ b/ruoyi-ui/src/views/in/stockIn/index.vue @@ -9,16 +9,43 @@ @keyup.enter.native="handleQuery" /> - + + + + + --> - + + + @@ -358,12 +379,16 @@ export default { detailLoading: true, // 选中数组 ids: [], + detailIds: [], // 主表选中的数据 stockInListSelected: [], + stockInDetailListSelected: [], // 非单个禁用 single: true, + detailSingle: true, // 非多个禁用 multiple: true, + detailMultiple: true, // 显示搜索条件 showSearch: true, // 总条数 @@ -385,7 +410,7 @@ export default { inType: null, createDate: null, createManId: null, - status: null, + status: '1', warehouseId: null, finishDate: null, erpBill: null, @@ -493,6 +518,12 @@ export default { this.single = selection.length !== 1 this.multiple = !selection.length }, + handleDetailSelectionChange(selection){ + this.detailIds = selection.map(item => item.stockinDetailId) + this.stockInDetailListSelected = selection + this.detailSingle = selection.length !== 1 + this.detailMultiple = !selection.length + }, /** 新增按钮操作 */ handleAdd() { this.reset() @@ -565,7 +596,12 @@ export default { }, /** 打印条码按钮操作 */ handleBarcodePrinting(row){ - barcodePrinting(row.stockinGuid).then(response => { + const stockInId = row.stockinDetailId ||this.detailIds; + //console.log(stockInId) + var data = { + "stockinIdList": stockInId + } + barcodePrinting(data).then(response => { this.$modal.msgSuccess("打印成功") this.getList() }) @@ -611,6 +647,7 @@ export default { getDetailList(stockinId) { this.detailLoading = true; this.queryDetailParams.stockinId = stockinId; + this.queryDetailParams.status = this.queryParams.status; listStockInDetail(this.queryDetailParams).then(response => { this.stockInDetailList = response.rows; this.detailTotal = response.total;