diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteFileService.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteFileService.java index ef075df9..593895bf 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteFileService.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteFileService.java @@ -6,10 +6,7 @@ import com.ruoyi.system.api.domain.SysFileInfo; import com.ruoyi.system.api.factory.RemoteFileFallbackFactory; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.http.MediaType; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestPart; +import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; /** @@ -34,6 +31,6 @@ public interface RemoteFileService { * @param fileIds 文件id * @return 结果 */ - @DeleteMapping("/deleteFiles/{fileIds}") - R deleteFiles(@PathVariable String[] fileIds); + @DeleteMapping("/deleteFiles") + R deleteFiles(@RequestParam("fileIds") String[] fileIds); } diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/controller/SysFileController.java b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/controller/SysFileController.java index 67f095e3..84d143d6 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/controller/SysFileController.java +++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/controller/SysFileController.java @@ -1,17 +1,17 @@ package com.ruoyi.file.controller; +import com.ruoyi.common.core.domain.R; +import com.ruoyi.common.core.utils.file.FileUtils; import com.ruoyi.file.domain.FileResult; +import com.ruoyi.file.service.ISysFileService; +import com.ruoyi.system.api.domain.SysFileInfo; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.core.utils.file.FileUtils; -import com.ruoyi.file.service.ISysFileService; -import com.ruoyi.system.api.domain.SysFileInfo; /** * 文件请求处理 @@ -50,8 +50,8 @@ public class SysFileController { /** * 删除文件 */ - @PostMapping("deleteFiles/{fileIds}") - public R deleteFiles(@PathVariable String[] fileIds) { + @PostMapping("deleteFiles") + public R deleteFiles(@RequestParam("fileIds") String[] fileIds) { try { FileResult fileResult = sysFileService.deleteFiles(fileIds); return fileResult.isSuccess() ? R.ok() : R.fail(fileResult.getMessage("删除文件失败")); diff --git a/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/controller/TestWmsController.java b/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/controller/ATestWmsController.java similarity index 81% rename from ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/controller/TestWmsController.java rename to ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/controller/ATestWmsController.java index 92e6218e..038d7d7f 100644 --- a/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/controller/TestWmsController.java +++ b/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/controller/ATestWmsController.java @@ -12,11 +12,11 @@ import org.springframework.web.bind.annotation.RestController; */ @RequestMapping("/test") @RestController -public class TestWmsController extends BaseController { +public class ATestWmsController extends BaseController { @GetMapping("/showInfo") public AjaxResult showInfo() { - return success("Hello World! This is wms module."); + return success("Hello World! This is WMS module."); } } diff --git a/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/controller/ItemInfoController.java b/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/controller/master/ItemInfoController.java similarity index 97% rename from ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/controller/ItemInfoController.java rename to ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/controller/master/ItemInfoController.java index 1c6de06e..a353dc6c 100644 --- a/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/controller/ItemInfoController.java +++ b/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/controller/master/ItemInfoController.java @@ -1,4 +1,4 @@ -package com.ruoyi.wms.controller; +package com.ruoyi.wms.controller.master; import com.ruoyi.common.core.utils.poi.ExcelUtil; import com.ruoyi.common.core.web.controller.BaseController; @@ -8,7 +8,7 @@ import com.ruoyi.common.log.annotation.Log; import com.ruoyi.common.log.enums.BusinessType; import com.ruoyi.common.security.annotation.RequiresPermissions; import com.ruoyi.wms.domain.ItemInfo; -import com.ruoyi.wms.service.IItemInfoService; +import com.ruoyi.wms.service.master.IItemInfoService; import jakarta.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/controller/ItemTypeController.java b/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/controller/master/ItemTypeController.java similarity index 96% rename from ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/controller/ItemTypeController.java rename to ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/controller/master/ItemTypeController.java index 74a327a7..909ab6d1 100644 --- a/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/controller/ItemTypeController.java +++ b/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/controller/master/ItemTypeController.java @@ -1,4 +1,4 @@ -package com.ruoyi.wms.controller; +package com.ruoyi.wms.controller.master; import com.ruoyi.common.core.utils.poi.ExcelUtil; import com.ruoyi.common.core.web.controller.BaseController; @@ -8,7 +8,7 @@ import com.ruoyi.common.log.annotation.Log; import com.ruoyi.common.log.enums.BusinessType; import com.ruoyi.common.security.annotation.RequiresPermissions; import com.ruoyi.wms.domain.ItemType; -import com.ruoyi.wms.service.IItemTypeService; +import com.ruoyi.wms.service.master.IItemTypeService; import jakarta.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/controller/UnitInfoController.java b/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/controller/master/UnitInfoController.java similarity index 97% rename from ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/controller/UnitInfoController.java rename to ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/controller/master/UnitInfoController.java index d60d3a6c..d353491b 100644 --- a/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/controller/UnitInfoController.java +++ b/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/controller/master/UnitInfoController.java @@ -1,4 +1,4 @@ -package com.ruoyi.wms.controller; +package com.ruoyi.wms.controller.master; import com.ruoyi.common.core.utils.poi.ExcelUtil; import com.ruoyi.common.core.web.controller.BaseController; @@ -8,7 +8,7 @@ import com.ruoyi.common.log.annotation.Log; import com.ruoyi.common.log.enums.BusinessType; import com.ruoyi.common.security.annotation.RequiresPermissions; import com.ruoyi.wms.domain.UnitInfo; -import com.ruoyi.wms.service.IUnitInfoService; +import com.ruoyi.wms.service.master.IUnitInfoService; import jakarta.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/controller/WarehouseInfoController.java b/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/controller/master/WarehouseInfoController.java similarity index 97% rename from ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/controller/WarehouseInfoController.java rename to ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/controller/master/WarehouseInfoController.java index 0324cf83..3a820fbf 100644 --- a/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/controller/WarehouseInfoController.java +++ b/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/controller/master/WarehouseInfoController.java @@ -1,4 +1,4 @@ -package com.ruoyi.wms.controller; +package com.ruoyi.wms.controller.master; import com.ruoyi.common.core.utils.poi.ExcelUtil; import com.ruoyi.common.core.web.controller.BaseController; @@ -8,7 +8,7 @@ import com.ruoyi.common.log.annotation.Log; import com.ruoyi.common.log.enums.BusinessType; import com.ruoyi.common.security.annotation.RequiresPermissions; import com.ruoyi.wms.domain.WarehouseInfo; -import com.ruoyi.wms.service.IWarehouseInfoService; +import com.ruoyi.wms.service.master.IWarehouseInfoService; import jakarta.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/controller/stock/BaseStockController.java b/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/controller/stock/BaseStockController.java new file mode 100644 index 00000000..b4f0a5ab --- /dev/null +++ b/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/controller/stock/BaseStockController.java @@ -0,0 +1,67 @@ +package com.ruoyi.wms.controller.stock; + +import com.ruoyi.common.core.web.controller.BaseController; +import com.ruoyi.common.core.web.domain.AjaxResult; +import com.ruoyi.common.core.web.page.TableDataInfo; +import com.ruoyi.common.security.annotation.RequiresPermissions; +import com.ruoyi.wms.domain.BaseStock; +import com.ruoyi.wms.service.stock.IBaseStockService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * 基本库存Controller + * + * @author ryas + * created on 2024-02-22 + */ +@RestController +@RequestMapping("/BaseStock") +public class BaseStockController extends BaseController { + @Autowired + private IBaseStockService baseStockService; + + /** + * 查询基本库存列表 + */ + @RequiresPermissions("wms:BaseStock:list") + @GetMapping("/list") + public TableDataInfo list(BaseStock baseStock) { + startPage(); + List list = baseStockService.selectBaseStockList(baseStock); + return getDataTable(list); + } + + //TODO 如果要启用导出功能，需要在domain实体类的字段上添加注解：@com.ruoyi.common.core.annotation.Excel(name = "字段名") + /* + * 导出基本库存列表 + */ +// @RequiresPermissions("wms:BaseStock:export") +// @Log(title = "基本库存", businessType = BusinessType.EXPORT) +// @PostMapping("/export") +// public void export(HttpServletResponse response, BaseStock baseStock) +// { +// List list = baseStockService.selectBaseStockList(baseStock); +// if (list.isEmpty()) { +// responseJsonWarn(response, "没有数据可以导出"); +// return; +// } +// ExcelUtil util = new ExcelUtil<>(BaseStock.class); +// util.exportExcel(response, list, "基本库存数据"); +// } + + /** + * 获取基本库存详细信息 + */ + @RequiresPermissions("wms:BaseStock:query") + @GetMapping(value = "/{whsCd}") + public AjaxResult getInfo(@PathVariable("whsCd") String whsCd) { + return success(baseStockService.selectBaseStockByWhsCd(whsCd)); + } + +} diff --git a/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/domain/BaseStock.java b/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/domain/BaseStock.java new file mode 100644 index 00000000..2739d896 --- /dev/null +++ b/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/domain/BaseStock.java @@ -0,0 +1,145 @@ +package com.ruoyi.wms.domain; + +import com.ruoyi.common.core.web.domain.ExtBaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + +import java.io.Serial; +import java.io.Serializable; +import java.math.BigDecimal; + +/** + * This class was generated by MyBatis Generator. + * + *
    + *
  • Table: WMS_B_BASE_STOCK
    • + *
  • Remarks: 基本库存表
    • + *
+ * + * @author ryas + * created on 2024-02-22 + */ +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) +@Data +public class BaseStock extends ExtBaseEntity implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + //==================== ↓↓↓↓↓↓ 非表字段 ↓↓↓↓↓↓ ==================== + + /** + * 仓库名称 + */ + private String whsName; + + /** + * 物品名称 + */ + private String itemName; + + /** + * 标准单位代码 + */ + private String stdUnitCd; + + /** + * 标准单位名称 + */ + private String stdUnitName; + + /** + * 包装单位代码 + */ + private String pkgUnitCd; + + /** + * 包装单位名称 + */ + private String pkgUnitName; + + //==================== ↓↓↓↓↓↓ 表字段 ↓↓↓↓↓↓ ==================== + + /** + * 仓库代码 + */ + private String whsCd; + + /** + * 货架号 + */ + private String stgBinCd; + + /** + * 物品代码 + */ + private String itemCd; + + /** + * 批号 + */ + private String lotNo; + + /** + * 子批号 + */ + private String subLotNo; + + /** + * 从属部门ID + */ + private Integer deptId; + + /** + * 标准单位数量 + */ + private BigDecimal stdUnitQty; + + /** + * 包装单位数量 + */ + private BigDecimal pkgUnitQty; + + /** + * 序列号 + */ + private String serialNo; + + /** + * 托盘ID + */ + private String palletId; + + /** + * 父托盘ID + */ + private String parentPalletId; + + /** + * 备注1 + */ + private String remark1; + + /** + * 备注2 + */ + private String remark2; + + /** + * 备注3 + */ + private String remark3; + + /** + * 备注4 + */ + private String remark4; + + /** + * 备注5 + */ + private String remark5; + +} \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/domain/InvTransHis.java b/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/domain/InvTransHis.java new file mode 100644 index 00000000..34f73855 --- /dev/null +++ b/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/domain/InvTransHis.java @@ -0,0 +1,342 @@ +package com.ruoyi.wms.domain; + +import com.ruoyi.common.core.web.domain.ExtBaseEntity; + +import java.io.Serial; +import java.io.Serializable; +import java.math.BigDecimal; + +/** + * This class was generated by MyBatis Generator. + * + *
    + *
  • Table: WMS_B_INV_TRANS_HIS
    • + *
  • Remarks: 入出库履历表
    • + *
+ * + * @author ryas + * created on 2024-02-22 + */ +public class InvTransHis extends ExtBaseEntity implements Serializable { + /** + * 入出库履历号 + */ + private String invTransNo; + + /** + * 从属部门ID + */ + private Integer deptId; + + /** + * 入出库类型(1:入库,2:出库) + */ + private Integer invTransType; + + /** + * 仓库代码 + */ + private String whsCd; + + /** + * 货架号 + */ + private String stgBinCd; + + /** + * 托盘ID + */ + private String palletId; + + /** + * 标准单位数量 + */ + private BigDecimal stdUnitQty; + + /** + * 包装单位数量 + */ + private BigDecimal pkgUnitQty; + + /** + * 交易单号 + */ + private String transOrderNo; + + /** + * 交易单明细号 + */ + private String transOrderDetlNo; + + /** + * 操作员 + */ + private String operator; + + /** + * 业务区分 + */ + private String businessCls; + + /** + * 物品代码 + */ + private String itemCd; + + /** + * 批号 + */ + private String lotNo; + + /** + * 子批号 + */ + private String subLotNo; + + /** + * 序列号 + */ + private String serialNo; + + /** + * 入出库理由 + */ + private String reason; + + /** + * 备注1 + */ + private String remark1; + + /** + * 备注2 + */ + private String remark2; + + /** + * 备注3 + */ + private String remark3; + + /** + * 备注4 + */ + private String remark4; + + /** + * 备注5 + */ + private String remark5; + + @Serial + private static final long serialVersionUID = 1L; + + public String getInvTransNo() { + return invTransNo; + } + + public void setInvTransNo(String invTransNo) { + this.invTransNo = invTransNo == null ? null : invTransNo.trim(); + } + + public Integer getDeptId() { + return deptId; + } + + public void setDeptId(Integer deptId) { + this.deptId = deptId; + } + + public Integer getInvTransType() { + return invTransType; + } + + public void setInvTransType(Integer invTransType) { + this.invTransType = invTransType; + } + + public String getWhsCd() { + return whsCd; + } + + public void setWhsCd(String whsCd) { + this.whsCd = whsCd == null ? null : whsCd.trim(); + } + + public String getStgBinCd() { + return stgBinCd; + } + + public void setStgBinCd(String stgBinCd) { + this.stgBinCd = stgBinCd == null ? null : stgBinCd.trim(); + } + + public String getPalletId() { + return palletId; + } + + public void setPalletId(String palletId) { + this.palletId = palletId == null ? null : palletId.trim(); + } + + public BigDecimal getStdUnitQty() { + return stdUnitQty; + } + + public void setStdUnitQty(BigDecimal stdUnitQty) { + this.stdUnitQty = stdUnitQty; + } + + public BigDecimal getPkgUnitQty() { + return pkgUnitQty; + } + + public void setPkgUnitQty(BigDecimal pkgUnitQty) { + this.pkgUnitQty = pkgUnitQty; + } + + public String getTransOrderNo() { + return transOrderNo; + } + + public void setTransOrderNo(String transOrderNo) { + this.transOrderNo = transOrderNo == null ? null : transOrderNo.trim(); + } + + public String getTransOrderDetlNo() { + return transOrderDetlNo; + } + + public void setTransOrderDetlNo(String transOrderDetlNo) { + this.transOrderDetlNo = transOrderDetlNo == null ? null : transOrderDetlNo.trim(); + } + + public String getOperator() { + return operator; + } + + public void setOperator(String operator) { + this.operator = operator == null ? null : operator.trim(); + } + + public String getBusinessCls() { + return businessCls; + } + + public void setBusinessCls(String businessCls) { + this.businessCls = businessCls == null ? null : businessCls.trim(); + } + + public String getItemCd() { + return itemCd; + } + + public void setItemCd(String itemCd) { + this.itemCd = itemCd == null ? null : itemCd.trim(); + } + + public String getLotNo() { + return lotNo; + } + + public void setLotNo(String lotNo) { + this.lotNo = lotNo == null ? null : lotNo.trim(); + } + + public String getSubLotNo() { + return subLotNo; + } + + public void setSubLotNo(String subLotNo) { + this.subLotNo = subLotNo == null ? null : subLotNo.trim(); + } + + public String getSerialNo() { + return serialNo; + } + + public void setSerialNo(String serialNo) { + this.serialNo = serialNo == null ? null : serialNo.trim(); + } + + public String getReason() { + return reason; + } + + public void setReason(String reason) { + this.reason = reason == null ? null : reason.trim(); + } + + public String getRemark1() { + return remark1; + } + + public void setRemark1(String remark1) { + this.remark1 = remark1 == null ? null : remark1.trim(); + } + + public String getRemark2() { + return remark2; + } + + public void setRemark2(String remark2) { + this.remark2 = remark2 == null ? null : remark2.trim(); + } + + public String getRemark3() { + return remark3; + } + + public void setRemark3(String remark3) { + this.remark3 = remark3 == null ? null : remark3.trim(); + } + + public String getRemark4() { + return remark4; + } + + public void setRemark4(String remark4) { + this.remark4 = remark4 == null ? null : remark4.trim(); + } + + public String getRemark5() { + return remark5; + } + + public void setRemark5(String remark5) { + this.remark5 = remark5 == null ? null : remark5.trim(); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append(getClass().getSimpleName()); + sb.append(" ["); + sb.append("Hash = ").append(hashCode()); + sb.append(", invTransNo=").append(invTransNo); + sb.append(", deptId=").append(deptId); + sb.append(", invTransType=").append(invTransType); + sb.append(", whsCd=").append(whsCd); + sb.append(", stgBinCd=").append(stgBinCd); + sb.append(", palletId=").append(palletId); + sb.append(", stdUnitQty=").append(stdUnitQty); + sb.append(", pkgUnitQty=").append(pkgUnitQty); + sb.append(", transOrderNo=").append(transOrderNo); + sb.append(", transOrderDetlNo=").append(transOrderDetlNo); + sb.append(", operator=").append(operator); + sb.append(", businessCls=").append(businessCls); + sb.append(", itemCd=").append(itemCd); + sb.append(", lotNo=").append(lotNo); + sb.append(", subLotNo=").append(subLotNo); + sb.append(", serialNo=").append(serialNo); + sb.append(", reason=").append(reason); + sb.append(", remark1=").append(remark1); + sb.append(", remark2=").append(remark2); + sb.append(", remark3=").append(remark3); + sb.append(", remark4=").append(remark4); + sb.append(", remark5=").append(remark5); + sb.append(", serialVersionUID=").append(serialVersionUID); + sb.append("]"); + return sb.toString(); + } +} \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/mapper/ItemInfoDynamicSqlSupport.java b/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/mapper/master/ItemInfoDynamicSqlSupport.java similarity index 99% rename from ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/mapper/ItemInfoDynamicSqlSupport.java rename to ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/mapper/master/ItemInfoDynamicSqlSupport.java index de808d8e..4911d929 100644 --- a/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/mapper/ItemInfoDynamicSqlSupport.java +++ b/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/mapper/master/ItemInfoDynamicSqlSupport.java @@ -1,4 +1,4 @@ -package com.ruoyi.wms.mapper; +package com.ruoyi.wms.mapper.master; import java.math.BigDecimal; import java.sql.JDBCType; diff --git a/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/mapper/ItemInfoExtMapper.java b/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/mapper/master/ItemInfoExtMapper.java similarity index 88% rename from ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/mapper/ItemInfoExtMapper.java rename to ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/mapper/master/ItemInfoExtMapper.java index f2f8b59d..6449477a 100644 --- a/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/mapper/ItemInfoExtMapper.java +++ b/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/mapper/master/ItemInfoExtMapper.java @@ -1,4 +1,4 @@ -package com.ruoyi.wms.mapper; +package com.ruoyi.wms.mapper.master; import com.ruoyi.wms.domain.ItemInfo; diff --git a/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/mapper/ItemInfoMapper.java b/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/mapper/master/ItemInfoMapper.java similarity index 99% rename from ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/mapper/ItemInfoMapper.java rename to ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/mapper/master/ItemInfoMapper.java index e2d8b061..4a3786e4 100644 --- a/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/mapper/ItemInfoMapper.java +++ b/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/mapper/master/ItemInfoMapper.java @@ -1,6 +1,6 @@ -package com.ruoyi.wms.mapper; +package com.ruoyi.wms.mapper.master; -import static com.ruoyi.wms.mapper.ItemInfoDynamicSqlSupport.*; +import static com.ruoyi.wms.mapper.master.ItemInfoDynamicSqlSupport.*; import static org.mybatis.dynamic.sql.SqlBuilder.isEqualTo; import com.ruoyi.common.security.utils.SecurityUtilsExt; diff --git a/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/mapper/ItemTypeDynamicSqlSupport.java b/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/mapper/master/ItemTypeDynamicSqlSupport.java similarity index 98% rename from ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/mapper/ItemTypeDynamicSqlSupport.java rename to ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/mapper/master/ItemTypeDynamicSqlSupport.java index 36114117..ab66bed7 100644 --- a/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/mapper/ItemTypeDynamicSqlSupport.java +++ b/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/mapper/master/ItemTypeDynamicSqlSupport.java @@ -1,4 +1,4 @@ -package com.ruoyi.wms.mapper; +package com.ruoyi.wms.mapper.master; import org.mybatis.dynamic.sql.AliasableSqlTable; import org.mybatis.dynamic.sql.SqlColumn; diff --git a/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/mapper/ItemTypeMapper.java b/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/mapper/master/ItemTypeMapper.java similarity index 99% rename from ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/mapper/ItemTypeMapper.java rename to ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/mapper/master/ItemTypeMapper.java index 64baf4d6..b819b15f 100644 --- a/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/mapper/ItemTypeMapper.java +++ b/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/mapper/master/ItemTypeMapper.java @@ -1,6 +1,6 @@ -package com.ruoyi.wms.mapper; +package com.ruoyi.wms.mapper.master; -import static com.ruoyi.wms.mapper.ItemTypeDynamicSqlSupport.*; +import static com.ruoyi.wms.mapper.master.ItemTypeDynamicSqlSupport.*; import static org.mybatis.dynamic.sql.SqlBuilder.isEqualTo; import com.ruoyi.common.security.utils.SecurityUtilsExt; diff --git a/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/mapper/UnitInfoDynamicSqlSupport.java b/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/mapper/master/UnitInfoDynamicSqlSupport.java similarity index 98% rename from ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/mapper/UnitInfoDynamicSqlSupport.java rename to ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/mapper/master/UnitInfoDynamicSqlSupport.java index 854a8ad2..10fb44fa 100644 --- a/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/mapper/UnitInfoDynamicSqlSupport.java +++ b/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/mapper/master/UnitInfoDynamicSqlSupport.java @@ -1,4 +1,4 @@ -package com.ruoyi.wms.mapper; +package com.ruoyi.wms.mapper.master; import org.mybatis.dynamic.sql.AliasableSqlTable; import org.mybatis.dynamic.sql.SqlColumn; diff --git a/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/mapper/UnitInfoMapper.java b/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/mapper/master/UnitInfoMapper.java similarity index 99% rename from ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/mapper/UnitInfoMapper.java rename to ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/mapper/master/UnitInfoMapper.java index f6f3b5e7..3c842af1 100644 --- a/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/mapper/UnitInfoMapper.java +++ b/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/mapper/master/UnitInfoMapper.java @@ -1,6 +1,6 @@ -package com.ruoyi.wms.mapper; +package com.ruoyi.wms.mapper.master; -import static com.ruoyi.wms.mapper.UnitInfoDynamicSqlSupport.*; +import static com.ruoyi.wms.mapper.master.UnitInfoDynamicSqlSupport.*; import static org.mybatis.dynamic.sql.SqlBuilder.isEqualTo; import com.ruoyi.common.security.utils.SecurityUtilsExt; diff --git a/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/mapper/WarehouseInfoDynamicSqlSupport.java b/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/mapper/master/WarehouseInfoDynamicSqlSupport.java similarity index 99% rename from ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/mapper/WarehouseInfoDynamicSqlSupport.java rename to ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/mapper/master/WarehouseInfoDynamicSqlSupport.java index 09cb00f2..29c0d6f6 100644 --- a/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/mapper/WarehouseInfoDynamicSqlSupport.java +++ b/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/mapper/master/WarehouseInfoDynamicSqlSupport.java @@ -1,4 +1,4 @@ -package com.ruoyi.wms.mapper; +package com.ruoyi.wms.mapper.master; import java.math.BigDecimal; import java.sql.JDBCType; diff --git a/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/mapper/WarehouseInfoMapper.java b/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/mapper/master/WarehouseInfoMapper.java similarity index 99% rename from ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/mapper/WarehouseInfoMapper.java rename to ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/mapper/master/WarehouseInfoMapper.java index 126f7f89..c224a309 100644 --- a/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/mapper/WarehouseInfoMapper.java +++ b/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/mapper/master/WarehouseInfoMapper.java @@ -1,4 +1,4 @@ -package com.ruoyi.wms.mapper; +package com.ruoyi.wms.mapper.master; import com.ruoyi.common.security.utils.SecurityUtilsExt; import com.ruoyi.wms.domain.WarehouseInfo; @@ -19,7 +19,7 @@ import java.util.Collection; import java.util.List; import java.util.Optional; -import static com.ruoyi.wms.mapper.WarehouseInfoDynamicSqlSupport.*; +import static com.ruoyi.wms.mapper.master.WarehouseInfoDynamicSqlSupport.*; import static org.mybatis.dynamic.sql.SqlBuilder.isEqualTo; @Mapper diff --git a/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/mapper/stock/BaseStockDynamicSqlSupport.java b/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/mapper/stock/BaseStockDynamicSqlSupport.java new file mode 100644 index 00000000..0b79f375 --- /dev/null +++ b/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/mapper/stock/BaseStockDynamicSqlSupport.java @@ -0,0 +1,178 @@ +package com.ruoyi.wms.mapper.stock; + +import java.math.BigDecimal; +import java.sql.JDBCType; +import java.util.Date; +import org.mybatis.dynamic.sql.AliasableSqlTable; +import org.mybatis.dynamic.sql.SqlColumn; + +public final class BaseStockDynamicSqlSupport { + public static final BaseStock baseStock = new BaseStock(); + + /** + * 仓库代码 + */ + public static final SqlColumn whsCd = baseStock.whsCd; + + /** + * 货架号 + */ + public static final SqlColumn stgBinCd = baseStock.stgBinCd; + + /** + * 物品代码 + */ + public static final SqlColumn itemCd = baseStock.itemCd; + + /** + * 批号 + */ + public static final SqlColumn lotNo = baseStock.lotNo; + + /** + * 子批号 + */ + public static final SqlColumn subLotNo = baseStock.subLotNo; + + /** + * 从属部门ID + */ + public static final SqlColumn deptId = baseStock.deptId; + + /** + * 标准单位数量 + */ + public static final SqlColumn stdUnitQty = baseStock.stdUnitQty; + + /** + * 包装单位数量 + */ + public static final SqlColumn pkgUnitQty = baseStock.pkgUnitQty; + + /** + * 序列号 + */ + public static final SqlColumn serialNo = baseStock.serialNo; + + /** + * 托盘ID + */ + public static final SqlColumn palletId = baseStock.palletId; + + /** + * 父托盘ID + */ + public static final SqlColumn parentPalletId = baseStock.parentPalletId; + + /** + * 备注1 + */ + public static final SqlColumn remark1 = baseStock.remark1; + + /** + * 备注2 + */ + public static final SqlColumn remark2 = baseStock.remark2; + + /** + * 备注3 + */ + public static final SqlColumn remark3 = baseStock.remark3; + + /** + * 备注4 + */ + public static final SqlColumn remark4 = baseStock.remark4; + + /** + * 备注5 + */ + public static final SqlColumn remark5 = baseStock.remark5; + + /** + * 更新次数 + */ + public static final SqlColumn updateCount = baseStock.updateCount; + + /** + * 删除标志 + */ + public static final SqlColumn deleteFlag = baseStock.deleteFlag; + + /** + * 创建者 + */ + public static final SqlColumn createBy = baseStock.createBy; + + /** + * 创建时间 + */ + public static final SqlColumn createTime = baseStock.createTime; + + /** + * 更新者 + */ + public static final SqlColumn updateBy = baseStock.updateBy; + + /** + * 更新时间 + */ + public static final SqlColumn updateTime = baseStock.updateTime; + + /** + * 备注 + */ + public static final SqlColumn remark = baseStock.remark; + + public static final class BaseStock extends AliasableSqlTable { + public final SqlColumn whsCd = column("WHS_CD", JDBCType.VARCHAR); + + public final SqlColumn stgBinCd = column("STG_BIN_CD", JDBCType.VARCHAR); + + public final SqlColumn itemCd = column("ITEM_CD", JDBCType.VARCHAR); + + public final SqlColumn lotNo = column("LOT_NO", JDBCType.VARCHAR); + + public final SqlColumn subLotNo = column("SUB_LOT_NO", JDBCType.VARCHAR); + + public final SqlColumn deptId = column("DEPT_ID", JDBCType.INTEGER); + + public final SqlColumn stdUnitQty = column("STD_UNIT_QTY", JDBCType.DECIMAL); + + public final SqlColumn pkgUnitQty = column("PKG_UNIT_QTY", JDBCType.DECIMAL); + + public final SqlColumn serialNo = column("SERIAL_NO", JDBCType.VARCHAR); + + public final SqlColumn palletId = column("PALLET_ID", JDBCType.VARCHAR); + + public final SqlColumn parentPalletId = column("PARENT_PALLET_ID", JDBCType.VARCHAR); + + public final SqlColumn remark1 = column("REMARK_1", JDBCType.VARCHAR); + + public final SqlColumn remark2 = column("REMARK_2", JDBCType.VARCHAR); + + public final SqlColumn remark3 = column("REMARK_3", JDBCType.VARCHAR); + + public final SqlColumn remark4 = column("REMARK_4", JDBCType.VARCHAR); + + public final SqlColumn remark5 = column("REMARK_5", JDBCType.VARCHAR); + + public final SqlColumn updateCount = column("UPDATE_COUNT", JDBCType.INTEGER); + + public final SqlColumn deleteFlag = column("DELETE_FLAG", JDBCType.INTEGER); + + public final SqlColumn createBy = column("create_by", JDBCType.VARCHAR); + + public final SqlColumn createTime = column("create_time", JDBCType.TIMESTAMP); + + public final SqlColumn updateBy = column("update_by", JDBCType.VARCHAR); + + public final SqlColumn updateTime = column("update_time", JDBCType.TIMESTAMP); + + public final SqlColumn remark = column("remark", JDBCType.VARCHAR); + + public BaseStock() { + super("WMS_B_BASE_STOCK", BaseStock::new); + } + } +} \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/mapper/stock/BaseStockExtMapper.java b/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/mapper/stock/BaseStockExtMapper.java new file mode 100644 index 00000000..898b9b27 --- /dev/null +++ b/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/mapper/stock/BaseStockExtMapper.java @@ -0,0 +1,15 @@ +package com.ruoyi.wms.mapper.stock; + +import com.ruoyi.wms.domain.BaseStock; + +import java.util.List; + +/** + * @author Alan Scipio + * created on 2024/2/22 + */ +public interface BaseStockExtMapper { + + List selectPageList(BaseStock baseStock); + +} diff --git a/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/mapper/stock/BaseStockMapper.java b/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/mapper/stock/BaseStockMapper.java new file mode 100644 index 00000000..f4390d92 --- /dev/null +++ b/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/mapper/stock/BaseStockMapper.java @@ -0,0 +1,310 @@ +package com.ruoyi.wms.mapper.stock; + +import static com.ruoyi.wms.mapper.stock.BaseStockDynamicSqlSupport.*; +import static org.mybatis.dynamic.sql.SqlBuilder.isEqualTo; + +import com.ruoyi.common.security.utils.SecurityUtilsExt; +import com.ruoyi.wms.domain.BaseStock; +import java.util.Collection; +import java.util.List; +import java.util.Optional; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Result; +import org.apache.ibatis.annotations.ResultMap; +import org.apache.ibatis.annotations.Results; +import org.apache.ibatis.annotations.SelectProvider; +import org.apache.ibatis.type.JdbcType; +import org.mybatis.dynamic.sql.BasicColumn; +import org.mybatis.dynamic.sql.delete.DeleteDSLCompleter; +import org.mybatis.dynamic.sql.select.CountDSLCompleter; +import org.mybatis.dynamic.sql.select.SelectDSLCompleter; +import org.mybatis.dynamic.sql.select.render.SelectStatementProvider; +import org.mybatis.dynamic.sql.update.UpdateDSL; +import org.mybatis.dynamic.sql.update.UpdateDSLCompleter; +import org.mybatis.dynamic.sql.update.UpdateModel; +import org.mybatis.dynamic.sql.util.SqlProviderAdapter; +import org.mybatis.dynamic.sql.util.mybatis3.CommonCountMapper; +import org.mybatis.dynamic.sql.util.mybatis3.CommonDeleteMapper; +import org.mybatis.dynamic.sql.util.mybatis3.CommonInsertMapper; +import org.mybatis.dynamic.sql.util.mybatis3.CommonUpdateMapper; +import org.mybatis.dynamic.sql.util.mybatis3.MyBatis3Utils; + +@Mapper +public interface BaseStockMapper extends CommonCountMapper, CommonDeleteMapper, CommonInsertMapper, CommonUpdateMapper { + BasicColumn[] selectList = BasicColumn.columnList(whsCd, stgBinCd, itemCd, lotNo, subLotNo, deptId, stdUnitQty, pkgUnitQty, serialNo, palletId, parentPalletId, remark1, remark2, remark3, remark4, remark5, updateCount, deleteFlag, createBy, createTime, updateBy, updateTime, remark); + + @SelectProvider(type=SqlProviderAdapter.class, method="select") + @Results(id="BaseStockResult", value = { + @Result(column="WHS_CD", property="whsCd", jdbcType=JdbcType.VARCHAR, id=true), + @Result(column="STG_BIN_CD", property="stgBinCd", jdbcType=JdbcType.VARCHAR, id=true), + @Result(column="ITEM_CD", property="itemCd", jdbcType=JdbcType.VARCHAR, id=true), + @Result(column="LOT_NO", property="lotNo", jdbcType=JdbcType.VARCHAR, id=true), + @Result(column="SUB_LOT_NO", property="subLotNo", jdbcType=JdbcType.VARCHAR, id=true), + @Result(column="DEPT_ID", property="deptId", jdbcType=JdbcType.INTEGER), + @Result(column="STD_UNIT_QTY", property="stdUnitQty", jdbcType=JdbcType.DECIMAL), + @Result(column="PKG_UNIT_QTY", property="pkgUnitQty", jdbcType=JdbcType.DECIMAL), + @Result(column="SERIAL_NO", property="serialNo", jdbcType=JdbcType.VARCHAR), + @Result(column="PALLET_ID", property="palletId", jdbcType=JdbcType.VARCHAR), + @Result(column="PARENT_PALLET_ID", property="parentPalletId", jdbcType=JdbcType.VARCHAR), + @Result(column="REMARK_1", property="remark1", jdbcType=JdbcType.VARCHAR), + @Result(column="REMARK_2", property="remark2", jdbcType=JdbcType.VARCHAR), + @Result(column="REMARK_3", property="remark3", jdbcType=JdbcType.VARCHAR), + @Result(column="REMARK_4", property="remark4", jdbcType=JdbcType.VARCHAR), + @Result(column="REMARK_5", property="remark5", jdbcType=JdbcType.VARCHAR), + @Result(column="UPDATE_COUNT", property="updateCount", jdbcType=JdbcType.INTEGER), + @Result(column="DELETE_FLAG", property="deleteFlag", jdbcType=JdbcType.INTEGER), + @Result(column="create_by", property="createBy", jdbcType=JdbcType.VARCHAR), + @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP), + @Result(column="update_by", property="updateBy", jdbcType=JdbcType.VARCHAR), + @Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP), + @Result(column="remark", property="remark", jdbcType=JdbcType.VARCHAR) + }) + List selectMany(SelectStatementProvider selectStatement); + + @SelectProvider(type=SqlProviderAdapter.class, method="select") + @ResultMap("BaseStockResult") + Optional selectOne(SelectStatementProvider selectStatement); + + default long count(CountDSLCompleter completer) { + return MyBatis3Utils.countFrom(this::count, baseStock, completer); + } + + default int delete(DeleteDSLCompleter completer) { + return MyBatis3Utils.deleteFrom(this::delete, baseStock, completer); + } + + default int deleteByPrimaryKey(String whsCd_, String stgBinCd_, String itemCd_, String lotNo_, String subLotNo_) { + return delete(c -> + c.where(whsCd, isEqualTo(whsCd_)) + .and(stgBinCd, isEqualTo(stgBinCd_)) + .and(itemCd, isEqualTo(itemCd_)) + .and(lotNo, isEqualTo(lotNo_)) + .and(subLotNo, isEqualTo(subLotNo_)) + ); + } + + default int insert(BaseStock row) { + row.setCommonForInsert(SecurityUtilsExt.getUserIdStr()); + return MyBatis3Utils.insert(this::insert, row, baseStock, c -> + c.map(whsCd).toProperty("whsCd") + .map(stgBinCd).toProperty("stgBinCd") + .map(itemCd).toProperty("itemCd") + .map(lotNo).toProperty("lotNo") + .map(subLotNo).toProperty("subLotNo") + .map(deptId).toProperty("deptId") + .map(stdUnitQty).toProperty("stdUnitQty") + .map(pkgUnitQty).toProperty("pkgUnitQty") + .map(serialNo).toProperty("serialNo") + .map(palletId).toProperty("palletId") + .map(parentPalletId).toProperty("parentPalletId") + .map(remark1).toProperty("remark1") + .map(remark2).toProperty("remark2") + .map(remark3).toProperty("remark3") + .map(remark4).toProperty("remark4") + .map(remark5).toProperty("remark5") + .map(updateCount).toProperty("updateCount") + .map(deleteFlag).toProperty("deleteFlag") + .map(createBy).toProperty("createBy") + .map(createTime).toProperty("createTime") + .map(updateBy).toProperty("updateBy") + .map(updateTime).toProperty("updateTime") + .map(remark).toProperty("remark") + ); + } + + default int insertMultiple(Collection records) { + for (BaseStock row : records) { + row.setCommonForInsert(SecurityUtilsExt.getUserIdStr()); + } + return MyBatis3Utils.insertMultiple(this::insertMultiple, records, baseStock, c -> + c.map(whsCd).toProperty("whsCd") + .map(stgBinCd).toProperty("stgBinCd") + .map(itemCd).toProperty("itemCd") + .map(lotNo).toProperty("lotNo") + .map(subLotNo).toProperty("subLotNo") + .map(deptId).toProperty("deptId") + .map(stdUnitQty).toProperty("stdUnitQty") + .map(pkgUnitQty).toProperty("pkgUnitQty") + .map(serialNo).toProperty("serialNo") + .map(palletId).toProperty("palletId") + .map(parentPalletId).toProperty("parentPalletId") + .map(remark1).toProperty("remark1") + .map(remark2).toProperty("remark2") + .map(remark3).toProperty("remark3") + .map(remark4).toProperty("remark4") + .map(remark5).toProperty("remark5") + .map(updateCount).toProperty("updateCount") + .map(deleteFlag).toProperty("deleteFlag") + .map(createBy).toProperty("createBy") + .map(createTime).toProperty("createTime") + .map(updateBy).toProperty("updateBy") + .map(updateTime).toProperty("updateTime") + .map(remark).toProperty("remark") + ); + } + + default int insertSelective(BaseStock row) { + row.setCommonForInsert(SecurityUtilsExt.getUserIdStr()); + return MyBatis3Utils.insert(this::insert, row, baseStock, c -> + c.map(whsCd).toPropertyWhenPresent("whsCd", row::getWhsCd) + .map(stgBinCd).toPropertyWhenPresent("stgBinCd", row::getStgBinCd) + .map(itemCd).toPropertyWhenPresent("itemCd", row::getItemCd) + .map(lotNo).toPropertyWhenPresent("lotNo", row::getLotNo) + .map(subLotNo).toPropertyWhenPresent("subLotNo", row::getSubLotNo) + .map(deptId).toPropertyWhenPresent("deptId", row::getDeptId) + .map(stdUnitQty).toPropertyWhenPresent("stdUnitQty", row::getStdUnitQty) + .map(pkgUnitQty).toPropertyWhenPresent("pkgUnitQty", row::getPkgUnitQty) + .map(serialNo).toPropertyWhenPresent("serialNo", row::getSerialNo) + .map(palletId).toPropertyWhenPresent("palletId", row::getPalletId) + .map(parentPalletId).toPropertyWhenPresent("parentPalletId", row::getParentPalletId) + .map(remark1).toPropertyWhenPresent("remark1", row::getRemark1) + .map(remark2).toPropertyWhenPresent("remark2", row::getRemark2) + .map(remark3).toPropertyWhenPresent("remark3", row::getRemark3) + .map(remark4).toPropertyWhenPresent("remark4", row::getRemark4) + .map(remark5).toPropertyWhenPresent("remark5", row::getRemark5) + .map(updateCount).toPropertyWhenPresent("updateCount", row::getUpdateCount) + .map(deleteFlag).toPropertyWhenPresent("deleteFlag", row::getDeleteFlag) + .map(createBy).toPropertyWhenPresent("createBy", row::getCreateBy) + .map(createTime).toPropertyWhenPresent("createTime", row::getCreateTime) + .map(updateBy).toPropertyWhenPresent("updateBy", row::getUpdateBy) + .map(updateTime).toPropertyWhenPresent("updateTime", row::getUpdateTime) + .map(remark).toPropertyWhenPresent("remark", row::getRemark) + ); + } + + default Optional selectOne(SelectDSLCompleter completer) { + return MyBatis3Utils.selectOne(this::selectOne, selectList, baseStock, completer); + } + + default List select(SelectDSLCompleter completer) { + return MyBatis3Utils.selectList(this::selectMany, selectList, baseStock, completer); + } + + default List selectDistinct(SelectDSLCompleter completer) { + return MyBatis3Utils.selectDistinct(this::selectMany, selectList, baseStock, completer); + } + + default Optional selectByPrimaryKey(String whsCd_, String stgBinCd_, String itemCd_, String lotNo_, String subLotNo_) { + return selectOne(c -> + c.where(whsCd, isEqualTo(whsCd_)) + .and(stgBinCd, isEqualTo(stgBinCd_)) + .and(itemCd, isEqualTo(itemCd_)) + .and(lotNo, isEqualTo(lotNo_)) + .and(subLotNo, isEqualTo(subLotNo_)) + ); + } + + default int update(UpdateDSLCompleter completer) { + return MyBatis3Utils.update(this::update, baseStock, completer); + } + + static UpdateDSL updateAllColumns(BaseStock row, UpdateDSL dsl) { + return dsl.set(whsCd).equalTo(row::getWhsCd) + .set(stgBinCd).equalTo(row::getStgBinCd) + .set(itemCd).equalTo(row::getItemCd) + .set(lotNo).equalTo(row::getLotNo) + .set(subLotNo).equalTo(row::getSubLotNo) + .set(deptId).equalTo(row::getDeptId) + .set(stdUnitQty).equalTo(row::getStdUnitQty) + .set(pkgUnitQty).equalTo(row::getPkgUnitQty) + .set(serialNo).equalTo(row::getSerialNo) + .set(palletId).equalTo(row::getPalletId) + .set(parentPalletId).equalTo(row::getParentPalletId) + .set(remark1).equalTo(row::getRemark1) + .set(remark2).equalTo(row::getRemark2) + .set(remark3).equalTo(row::getRemark3) + .set(remark4).equalTo(row::getRemark4) + .set(remark5).equalTo(row::getRemark5) + .set(updateCount).equalTo(row::getUpdateCount) + .set(deleteFlag).equalTo(row::getDeleteFlag) + .set(createBy).equalTo(row::getCreateBy) + .set(createTime).equalTo(row::getCreateTime) + .set(updateBy).equalTo(row::getUpdateBy) + .set(updateTime).equalTo(row::getUpdateTime) + .set(remark).equalTo(row::getRemark); + } + + static UpdateDSL updateSelectiveColumns(BaseStock row, UpdateDSL dsl) { + row.setCommonForUpdate(SecurityUtilsExt.getUserIdStr()); + return dsl.set(whsCd).equalToWhenPresent(row::getWhsCd) + .set(stgBinCd).equalToWhenPresent(row::getStgBinCd) + .set(itemCd).equalToWhenPresent(row::getItemCd) + .set(lotNo).equalToWhenPresent(row::getLotNo) + .set(subLotNo).equalToWhenPresent(row::getSubLotNo) + .set(deptId).equalToWhenPresent(row::getDeptId) + .set(stdUnitQty).equalToWhenPresent(row::getStdUnitQty) + .set(pkgUnitQty).equalToWhenPresent(row::getPkgUnitQty) + .set(serialNo).equalToWhenPresent(row::getSerialNo) + .set(palletId).equalToWhenPresent(row::getPalletId) + .set(parentPalletId).equalToWhenPresent(row::getParentPalletId) + .set(remark1).equalToWhenPresent(row::getRemark1) + .set(remark2).equalToWhenPresent(row::getRemark2) + .set(remark3).equalToWhenPresent(row::getRemark3) + .set(remark4).equalToWhenPresent(row::getRemark4) + .set(remark5).equalToWhenPresent(row::getRemark5) + .set(updateCount).equalToWhenPresent(row::getUpdateCount) + .set(deleteFlag).equalToWhenPresent(row::getDeleteFlag) + .set(createBy).equalToWhenPresent(row::getCreateBy) + .set(createTime).equalToWhenPresent(row::getCreateTime) + .set(updateBy).equalToWhenPresent(row::getUpdateBy) + .set(updateTime).equalToWhenPresent(row::getUpdateTime) + .set(remark).equalToWhenPresent(row::getRemark); + } + + default int updateByPrimaryKey(BaseStock row) { + return update(c -> + c.set(deptId).equalTo(row::getDeptId) + .set(stdUnitQty).equalTo(row::getStdUnitQty) + .set(pkgUnitQty).equalTo(row::getPkgUnitQty) + .set(serialNo).equalTo(row::getSerialNo) + .set(palletId).equalTo(row::getPalletId) + .set(parentPalletId).equalTo(row::getParentPalletId) + .set(remark1).equalTo(row::getRemark1) + .set(remark2).equalTo(row::getRemark2) + .set(remark3).equalTo(row::getRemark3) + .set(remark4).equalTo(row::getRemark4) + .set(remark5).equalTo(row::getRemark5) + .set(updateCount).equalTo(row::getUpdateCount) + .set(deleteFlag).equalTo(row::getDeleteFlag) + .set(createBy).equalTo(row::getCreateBy) + .set(createTime).equalTo(row::getCreateTime) + .set(updateBy).equalTo(row::getUpdateBy) + .set(updateTime).equalTo(row::getUpdateTime) + .set(remark).equalTo(row::getRemark) + .where(whsCd, isEqualTo(row::getWhsCd)) + .and(stgBinCd, isEqualTo(row::getStgBinCd)) + .and(itemCd, isEqualTo(row::getItemCd)) + .and(lotNo, isEqualTo(row::getLotNo)) + .and(subLotNo, isEqualTo(row::getSubLotNo)) + ); + } + + default int updateByPrimaryKeySelective(BaseStock row) { + row.setCommonForUpdate(SecurityUtilsExt.getUserIdStr()); + return update(c -> + c.set(deptId).equalToWhenPresent(row::getDeptId) + .set(stdUnitQty).equalToWhenPresent(row::getStdUnitQty) + .set(pkgUnitQty).equalToWhenPresent(row::getPkgUnitQty) + .set(serialNo).equalToWhenPresent(row::getSerialNo) + .set(palletId).equalToWhenPresent(row::getPalletId) + .set(parentPalletId).equalToWhenPresent(row::getParentPalletId) + .set(remark1).equalToWhenPresent(row::getRemark1) + .set(remark2).equalToWhenPresent(row::getRemark2) + .set(remark3).equalToWhenPresent(row::getRemark3) + .set(remark4).equalToWhenPresent(row::getRemark4) + .set(remark5).equalToWhenPresent(row::getRemark5) + .set(updateCount).equalToWhenPresent(row::getUpdateCount) + .set(deleteFlag).equalToWhenPresent(row::getDeleteFlag) + .set(createBy).equalToWhenPresent(row::getCreateBy) + .set(createTime).equalToWhenPresent(row::getCreateTime) + .set(updateBy).equalToWhenPresent(row::getUpdateBy) + .set(updateTime).equalToWhenPresent(row::getUpdateTime) + .set(remark).equalToWhenPresent(row::getRemark) + .where(whsCd, isEqualTo(row::getWhsCd)) + .and(stgBinCd, isEqualTo(row::getStgBinCd)) + .and(itemCd, isEqualTo(row::getItemCd)) + .and(lotNo, isEqualTo(row::getLotNo)) + .and(subLotNo, isEqualTo(row::getSubLotNo)) + ); + } +} \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/mapper/stock/InvTransHisDynamicSqlSupport.java b/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/mapper/stock/InvTransHisDynamicSqlSupport.java new file mode 100644 index 00000000..fc4cf7b5 --- /dev/null +++ b/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/mapper/stock/InvTransHisDynamicSqlSupport.java @@ -0,0 +1,220 @@ +package com.ruoyi.wms.mapper.stock; + +import java.math.BigDecimal; +import java.sql.JDBCType; +import java.util.Date; +import org.mybatis.dynamic.sql.AliasableSqlTable; +import org.mybatis.dynamic.sql.SqlColumn; + +public final class InvTransHisDynamicSqlSupport { + public static final InvTransHis invTransHis = new InvTransHis(); + + /** + * 入出库履历号 + */ + public static final SqlColumn invTransNo = invTransHis.invTransNo; + + /** + * 从属部门ID + */ + public static final SqlColumn deptId = invTransHis.deptId; + + /** + * 入出库类型(1:入库,2:出库) + */ + public static final SqlColumn invTransType = invTransHis.invTransType; + + /** + * 仓库代码 + */ + public static final SqlColumn whsCd = invTransHis.whsCd; + + /** + * 货架号 + */ + public static final SqlColumn stgBinCd = invTransHis.stgBinCd; + + /** + * 托盘ID + */ + public static final SqlColumn palletId = invTransHis.palletId; + + /** + * 标准单位数量 + */ + public static final SqlColumn stdUnitQty = invTransHis.stdUnitQty; + + /** + * 包装单位数量 + */ + public static final SqlColumn pkgUnitQty = invTransHis.pkgUnitQty; + + /** + * 交易单号 + */ + public static final SqlColumn transOrderNo = invTransHis.transOrderNo; + + /** + * 交易单明细号 + */ + public static final SqlColumn transOrderDetlNo = invTransHis.transOrderDetlNo; + + /** + * 操作员 + */ + public static final SqlColumn operator = invTransHis.operator; + + /** + * 业务区分 + */ + public static final SqlColumn businessCls = invTransHis.businessCls; + + /** + * 物品代码 + */ + public static final SqlColumn itemCd = invTransHis.itemCd; + + /** + * 批号 + */ + public static final SqlColumn lotNo = invTransHis.lotNo; + + /** + * 子批号 + */ + public static final SqlColumn subLotNo = invTransHis.subLotNo; + + /** + * 序列号 + */ + public static final SqlColumn serialNo = invTransHis.serialNo; + + /** + * 入出库理由 + */ + public static final SqlColumn reason = invTransHis.reason; + + /** + * 备注1 + */ + public static final SqlColumn remark1 = invTransHis.remark1; + + /** + * 备注2 + */ + public static final SqlColumn remark2 = invTransHis.remark2; + + /** + * 备注3 + */ + public static final SqlColumn remark3 = invTransHis.remark3; + + /** + * 备注4 + */ + public static final SqlColumn remark4 = invTransHis.remark4; + + /** + * 备注5 + */ + public static final SqlColumn remark5 = invTransHis.remark5; + + /** + * 更新次数 + */ + public static final SqlColumn updateCount = invTransHis.updateCount; + + /** + * 删除标志 + */ + public static final SqlColumn deleteFlag = invTransHis.deleteFlag; + + /** + * 创建者 + */ + public static final SqlColumn createBy = invTransHis.createBy; + + /** + * 创建时间 + */ + public static final SqlColumn createTime = invTransHis.createTime; + + /** + * 更新者 + */ + public static final SqlColumn updateBy = invTransHis.updateBy; + + /** + * 更新时间 + */ + public static final SqlColumn updateTime = invTransHis.updateTime; + + /** + * 备注 + */ + public static final SqlColumn remark = invTransHis.remark; + + public static final class InvTransHis extends AliasableSqlTable { + public final SqlColumn invTransNo = column("INV_TRANS_NO", JDBCType.VARCHAR); + + public final SqlColumn deptId = column("DEPT_ID", JDBCType.INTEGER); + + public final SqlColumn invTransType = column("INV_TRANS_TYPE", JDBCType.INTEGER); + + public final SqlColumn whsCd = column("WHS_CD", JDBCType.VARCHAR); + + public final SqlColumn stgBinCd = column("STG_BIN_CD", JDBCType.VARCHAR); + + public final SqlColumn palletId = column("PALLET_ID", JDBCType.VARCHAR); + + public final SqlColumn stdUnitQty = column("STD_UNIT_QTY", JDBCType.DECIMAL); + + public final SqlColumn pkgUnitQty = column("PKG_UNIT_QTY", JDBCType.DECIMAL); + + public final SqlColumn transOrderNo = column("TRANS_ORDER_NO", JDBCType.VARCHAR); + + public final SqlColumn transOrderDetlNo = column("TRANS_ORDER_DETL_NO", JDBCType.VARCHAR); + + public final SqlColumn operator = column("OPERATOR", JDBCType.VARCHAR); + + public final SqlColumn businessCls = column("BUSINESS_CLS", JDBCType.VARCHAR); + + public final SqlColumn itemCd = column("ITEM_CD", JDBCType.VARCHAR); + + public final SqlColumn lotNo = column("LOT_NO", JDBCType.VARCHAR); + + public final SqlColumn subLotNo = column("SUB_LOT_NO", JDBCType.VARCHAR); + + public final SqlColumn serialNo = column("SERIAL_NO", JDBCType.VARCHAR); + + public final SqlColumn reason = column("REASON", JDBCType.VARCHAR); + + public final SqlColumn remark1 = column("REMARK_1", JDBCType.VARCHAR); + + public final SqlColumn remark2 = column("REMARK_2", JDBCType.VARCHAR); + + public final SqlColumn remark3 = column("REMARK_3", JDBCType.VARCHAR); + + public final SqlColumn remark4 = column("REMARK_4", JDBCType.VARCHAR); + + public final SqlColumn remark5 = column("REMARK_5", JDBCType.VARCHAR); + + public final SqlColumn updateCount = column("UPDATE_COUNT", JDBCType.INTEGER); + + public final SqlColumn deleteFlag = column("DELETE_FLAG", JDBCType.INTEGER); + + public final SqlColumn createBy = column("create_by", JDBCType.VARCHAR); + + public final SqlColumn createTime = column("create_time", JDBCType.TIMESTAMP); + + public final SqlColumn updateBy = column("update_by", JDBCType.VARCHAR); + + public final SqlColumn updateTime = column("update_time", JDBCType.TIMESTAMP); + + public final SqlColumn remark = column("remark", JDBCType.VARCHAR); + + public InvTransHis() { + super("WMS_B_INV_TRANS_HIS", InvTransHis::new); + } + } +} \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/mapper/stock/InvTransHisMapper.java b/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/mapper/stock/InvTransHisMapper.java new file mode 100644 index 00000000..854b090b --- /dev/null +++ b/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/mapper/stock/InvTransHisMapper.java @@ -0,0 +1,350 @@ +package com.ruoyi.wms.mapper.stock; + +import static com.ruoyi.wms.mapper.stock.InvTransHisDynamicSqlSupport.*; +import static org.mybatis.dynamic.sql.SqlBuilder.isEqualTo; + +import com.ruoyi.common.security.utils.SecurityUtilsExt; +import com.ruoyi.wms.domain.InvTransHis; +import java.util.Collection; +import java.util.List; +import java.util.Optional; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Result; +import org.apache.ibatis.annotations.ResultMap; +import org.apache.ibatis.annotations.Results; +import org.apache.ibatis.annotations.SelectProvider; +import org.apache.ibatis.type.JdbcType; +import org.mybatis.dynamic.sql.BasicColumn; +import org.mybatis.dynamic.sql.delete.DeleteDSLCompleter; +import org.mybatis.dynamic.sql.select.CountDSLCompleter; +import org.mybatis.dynamic.sql.select.SelectDSLCompleter; +import org.mybatis.dynamic.sql.select.render.SelectStatementProvider; +import org.mybatis.dynamic.sql.update.UpdateDSL; +import org.mybatis.dynamic.sql.update.UpdateDSLCompleter; +import org.mybatis.dynamic.sql.update.UpdateModel; +import org.mybatis.dynamic.sql.util.SqlProviderAdapter; +import org.mybatis.dynamic.sql.util.mybatis3.CommonCountMapper; +import org.mybatis.dynamic.sql.util.mybatis3.CommonDeleteMapper; +import org.mybatis.dynamic.sql.util.mybatis3.CommonInsertMapper; +import org.mybatis.dynamic.sql.util.mybatis3.CommonUpdateMapper; +import org.mybatis.dynamic.sql.util.mybatis3.MyBatis3Utils; + +@Mapper +public interface InvTransHisMapper extends CommonCountMapper, CommonDeleteMapper, CommonInsertMapper, CommonUpdateMapper { + BasicColumn[] selectList = BasicColumn.columnList(invTransNo, deptId, invTransType, whsCd, stgBinCd, palletId, stdUnitQty, pkgUnitQty, transOrderNo, transOrderDetlNo, operator, businessCls, itemCd, lotNo, subLotNo, serialNo, reason, remark1, remark2, remark3, remark4, remark5, updateCount, deleteFlag, createBy, createTime, updateBy, updateTime, remark); + + @SelectProvider(type=SqlProviderAdapter.class, method="select") + @Results(id="InvTransHisResult", value = { + @Result(column="INV_TRANS_NO", property="invTransNo", jdbcType=JdbcType.VARCHAR, id=true), + @Result(column="DEPT_ID", property="deptId", jdbcType=JdbcType.INTEGER), + @Result(column="INV_TRANS_TYPE", property="invTransType", jdbcType=JdbcType.INTEGER), + @Result(column="WHS_CD", property="whsCd", jdbcType=JdbcType.VARCHAR), + @Result(column="STG_BIN_CD", property="stgBinCd", jdbcType=JdbcType.VARCHAR), + @Result(column="PALLET_ID", property="palletId", jdbcType=JdbcType.VARCHAR), + @Result(column="STD_UNIT_QTY", property="stdUnitQty", jdbcType=JdbcType.DECIMAL), + @Result(column="PKG_UNIT_QTY", property="pkgUnitQty", jdbcType=JdbcType.DECIMAL), + @Result(column="TRANS_ORDER_NO", property="transOrderNo", jdbcType=JdbcType.VARCHAR), + @Result(column="TRANS_ORDER_DETL_NO", property="transOrderDetlNo", jdbcType=JdbcType.VARCHAR), + @Result(column="OPERATOR", property="operator", jdbcType=JdbcType.VARCHAR), + @Result(column="BUSINESS_CLS", property="businessCls", jdbcType=JdbcType.VARCHAR), + @Result(column="ITEM_CD", property="itemCd", jdbcType=JdbcType.VARCHAR), + @Result(column="LOT_NO", property="lotNo", jdbcType=JdbcType.VARCHAR), + @Result(column="SUB_LOT_NO", property="subLotNo", jdbcType=JdbcType.VARCHAR), + @Result(column="SERIAL_NO", property="serialNo", jdbcType=JdbcType.VARCHAR), + @Result(column="REASON", property="reason", jdbcType=JdbcType.VARCHAR), + @Result(column="REMARK_1", property="remark1", jdbcType=JdbcType.VARCHAR), + @Result(column="REMARK_2", property="remark2", jdbcType=JdbcType.VARCHAR), + @Result(column="REMARK_3", property="remark3", jdbcType=JdbcType.VARCHAR), + @Result(column="REMARK_4", property="remark4", jdbcType=JdbcType.VARCHAR), + @Result(column="REMARK_5", property="remark5", jdbcType=JdbcType.VARCHAR), + @Result(column="UPDATE_COUNT", property="updateCount", jdbcType=JdbcType.INTEGER), + @Result(column="DELETE_FLAG", property="deleteFlag", jdbcType=JdbcType.INTEGER), + @Result(column="create_by", property="createBy", jdbcType=JdbcType.VARCHAR), + @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP), + @Result(column="update_by", property="updateBy", jdbcType=JdbcType.VARCHAR), + @Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP), + @Result(column="remark", property="remark", jdbcType=JdbcType.VARCHAR) + }) + List selectMany(SelectStatementProvider selectStatement); + + @SelectProvider(type=SqlProviderAdapter.class, method="select") + @ResultMap("InvTransHisResult") + Optional selectOne(SelectStatementProvider selectStatement); + + default long count(CountDSLCompleter completer) { + return MyBatis3Utils.countFrom(this::count, invTransHis, completer); + } + + default int delete(DeleteDSLCompleter completer) { + return MyBatis3Utils.deleteFrom(this::delete, invTransHis, completer); + } + + default int deleteByPrimaryKey(String invTransNo_) { + return delete(c -> + c.where(invTransNo, isEqualTo(invTransNo_)) + ); + } + + default int insert(InvTransHis row) { + row.setCommonForInsert(SecurityUtilsExt.getUserIdStr()); + return MyBatis3Utils.insert(this::insert, row, invTransHis, c -> + c.map(invTransNo).toProperty("invTransNo") + .map(deptId).toProperty("deptId") + .map(invTransType).toProperty("invTransType") + .map(whsCd).toProperty("whsCd") + .map(stgBinCd).toProperty("stgBinCd") + .map(palletId).toProperty("palletId") + .map(stdUnitQty).toProperty("stdUnitQty") + .map(pkgUnitQty).toProperty("pkgUnitQty") + .map(transOrderNo).toProperty("transOrderNo") + .map(transOrderDetlNo).toProperty("transOrderDetlNo") + .map(operator).toProperty("operator") + .map(businessCls).toProperty("businessCls") + .map(itemCd).toProperty("itemCd") + .map(lotNo).toProperty("lotNo") + .map(subLotNo).toProperty("subLotNo") + .map(serialNo).toProperty("serialNo") + .map(reason).toProperty("reason") + .map(remark1).toProperty("remark1") + .map(remark2).toProperty("remark2") + .map(remark3).toProperty("remark3") + .map(remark4).toProperty("remark4") + .map(remark5).toProperty("remark5") + .map(updateCount).toProperty("updateCount") + .map(deleteFlag).toProperty("deleteFlag") + .map(createBy).toProperty("createBy") + .map(createTime).toProperty("createTime") + .map(updateBy).toProperty("updateBy") + .map(updateTime).toProperty("updateTime") + .map(remark).toProperty("remark") + ); + } + + default int insertMultiple(Collection records) { + for (InvTransHis row : records) { + row.setCommonForInsert(SecurityUtilsExt.getUserIdStr()); + } + return MyBatis3Utils.insertMultiple(this::insertMultiple, records, invTransHis, c -> + c.map(invTransNo).toProperty("invTransNo") + .map(deptId).toProperty("deptId") + .map(invTransType).toProperty("invTransType") + .map(whsCd).toProperty("whsCd") + .map(stgBinCd).toProperty("stgBinCd") + .map(palletId).toProperty("palletId") + .map(stdUnitQty).toProperty("stdUnitQty") + .map(pkgUnitQty).toProperty("pkgUnitQty") + .map(transOrderNo).toProperty("transOrderNo") + .map(transOrderDetlNo).toProperty("transOrderDetlNo") + .map(operator).toProperty("operator") + .map(businessCls).toProperty("businessCls") + .map(itemCd).toProperty("itemCd") + .map(lotNo).toProperty("lotNo") + .map(subLotNo).toProperty("subLotNo") + .map(serialNo).toProperty("serialNo") + .map(reason).toProperty("reason") + .map(remark1).toProperty("remark1") + .map(remark2).toProperty("remark2") + .map(remark3).toProperty("remark3") + .map(remark4).toProperty("remark4") + .map(remark5).toProperty("remark5") + .map(updateCount).toProperty("updateCount") + .map(deleteFlag).toProperty("deleteFlag") + .map(createBy).toProperty("createBy") + .map(createTime).toProperty("createTime") + .map(updateBy).toProperty("updateBy") + .map(updateTime).toProperty("updateTime") + .map(remark).toProperty("remark") + ); + } + + default int insertSelective(InvTransHis row) { + row.setCommonForInsert(SecurityUtilsExt.getUserIdStr()); + return MyBatis3Utils.insert(this::insert, row, invTransHis, c -> + c.map(invTransNo).toPropertyWhenPresent("invTransNo", row::getInvTransNo) + .map(deptId).toPropertyWhenPresent("deptId", row::getDeptId) + .map(invTransType).toPropertyWhenPresent("invTransType", row::getInvTransType) + .map(whsCd).toPropertyWhenPresent("whsCd", row::getWhsCd) + .map(stgBinCd).toPropertyWhenPresent("stgBinCd", row::getStgBinCd) + .map(palletId).toPropertyWhenPresent("palletId", row::getPalletId) + .map(stdUnitQty).toPropertyWhenPresent("stdUnitQty", row::getStdUnitQty) + .map(pkgUnitQty).toPropertyWhenPresent("pkgUnitQty", row::getPkgUnitQty) + .map(transOrderNo).toPropertyWhenPresent("transOrderNo", row::getTransOrderNo) + .map(transOrderDetlNo).toPropertyWhenPresent("transOrderDetlNo", row::getTransOrderDetlNo) + .map(operator).toPropertyWhenPresent("operator", row::getOperator) + .map(businessCls).toPropertyWhenPresent("businessCls", row::getBusinessCls) + .map(itemCd).toPropertyWhenPresent("itemCd", row::getItemCd) + .map(lotNo).toPropertyWhenPresent("lotNo", row::getLotNo) + .map(subLotNo).toPropertyWhenPresent("subLotNo", row::getSubLotNo) + .map(serialNo).toPropertyWhenPresent("serialNo", row::getSerialNo) + .map(reason).toPropertyWhenPresent("reason", row::getReason) + .map(remark1).toPropertyWhenPresent("remark1", row::getRemark1) + .map(remark2).toPropertyWhenPresent("remark2", row::getRemark2) + .map(remark3).toPropertyWhenPresent("remark3", row::getRemark3) + .map(remark4).toPropertyWhenPresent("remark4", row::getRemark4) + .map(remark5).toPropertyWhenPresent("remark5", row::getRemark5) + .map(updateCount).toPropertyWhenPresent("updateCount", row::getUpdateCount) + .map(deleteFlag).toPropertyWhenPresent("deleteFlag", row::getDeleteFlag) + .map(createBy).toPropertyWhenPresent("createBy", row::getCreateBy) + .map(createTime).toPropertyWhenPresent("createTime", row::getCreateTime) + .map(updateBy).toPropertyWhenPresent("updateBy", row::getUpdateBy) + .map(updateTime).toPropertyWhenPresent("updateTime", row::getUpdateTime) + .map(remark).toPropertyWhenPresent("remark", row::getRemark) + ); + } + + default Optional selectOne(SelectDSLCompleter completer) { + return MyBatis3Utils.selectOne(this::selectOne, selectList, invTransHis, completer); + } + + default List select(SelectDSLCompleter completer) { + return MyBatis3Utils.selectList(this::selectMany, selectList, invTransHis, completer); + } + + default List selectDistinct(SelectDSLCompleter completer) { + return MyBatis3Utils.selectDistinct(this::selectMany, selectList, invTransHis, completer); + } + + default Optional selectByPrimaryKey(String invTransNo_) { + return selectOne(c -> + c.where(invTransNo, isEqualTo(invTransNo_)) + ); + } + + default int update(UpdateDSLCompleter completer) { + return MyBatis3Utils.update(this::update, invTransHis, completer); + } + + static UpdateDSL updateAllColumns(InvTransHis row, UpdateDSL dsl) { + return dsl.set(invTransNo).equalTo(row::getInvTransNo) + .set(deptId).equalTo(row::getDeptId) + .set(invTransType).equalTo(row::getInvTransType) + .set(whsCd).equalTo(row::getWhsCd) + .set(stgBinCd).equalTo(row::getStgBinCd) + .set(palletId).equalTo(row::getPalletId) + .set(stdUnitQty).equalTo(row::getStdUnitQty) + .set(pkgUnitQty).equalTo(row::getPkgUnitQty) + .set(transOrderNo).equalTo(row::getTransOrderNo) + .set(transOrderDetlNo).equalTo(row::getTransOrderDetlNo) + .set(operator).equalTo(row::getOperator) + .set(businessCls).equalTo(row::getBusinessCls) + .set(itemCd).equalTo(row::getItemCd) + .set(lotNo).equalTo(row::getLotNo) + .set(subLotNo).equalTo(row::getSubLotNo) + .set(serialNo).equalTo(row::getSerialNo) + .set(reason).equalTo(row::getReason) + .set(remark1).equalTo(row::getRemark1) + .set(remark2).equalTo(row::getRemark2) + .set(remark3).equalTo(row::getRemark3) + .set(remark4).equalTo(row::getRemark4) + .set(remark5).equalTo(row::getRemark5) + .set(updateCount).equalTo(row::getUpdateCount) + .set(deleteFlag).equalTo(row::getDeleteFlag) + .set(createBy).equalTo(row::getCreateBy) + .set(createTime).equalTo(row::getCreateTime) + .set(updateBy).equalTo(row::getUpdateBy) + .set(updateTime).equalTo(row::getUpdateTime) + .set(remark).equalTo(row::getRemark); + } + + static UpdateDSL updateSelectiveColumns(InvTransHis row, UpdateDSL dsl) { + row.setCommonForUpdate(SecurityUtilsExt.getUserIdStr()); + return dsl.set(invTransNo).equalToWhenPresent(row::getInvTransNo) + .set(deptId).equalToWhenPresent(row::getDeptId) + .set(invTransType).equalToWhenPresent(row::getInvTransType) + .set(whsCd).equalToWhenPresent(row::getWhsCd) + .set(stgBinCd).equalToWhenPresent(row::getStgBinCd) + .set(palletId).equalToWhenPresent(row::getPalletId) + .set(stdUnitQty).equalToWhenPresent(row::getStdUnitQty) + .set(pkgUnitQty).equalToWhenPresent(row::getPkgUnitQty) + .set(transOrderNo).equalToWhenPresent(row::getTransOrderNo) + .set(transOrderDetlNo).equalToWhenPresent(row::getTransOrderDetlNo) + .set(operator).equalToWhenPresent(row::getOperator) + .set(businessCls).equalToWhenPresent(row::getBusinessCls) + .set(itemCd).equalToWhenPresent(row::getItemCd) + .set(lotNo).equalToWhenPresent(row::getLotNo) + .set(subLotNo).equalToWhenPresent(row::getSubLotNo) + .set(serialNo).equalToWhenPresent(row::getSerialNo) + .set(reason).equalToWhenPresent(row::getReason) + .set(remark1).equalToWhenPresent(row::getRemark1) + .set(remark2).equalToWhenPresent(row::getRemark2) + .set(remark3).equalToWhenPresent(row::getRemark3) + .set(remark4).equalToWhenPresent(row::getRemark4) + .set(remark5).equalToWhenPresent(row::getRemark5) + .set(updateCount).equalToWhenPresent(row::getUpdateCount) + .set(deleteFlag).equalToWhenPresent(row::getDeleteFlag) + .set(createBy).equalToWhenPresent(row::getCreateBy) + .set(createTime).equalToWhenPresent(row::getCreateTime) + .set(updateBy).equalToWhenPresent(row::getUpdateBy) + .set(updateTime).equalToWhenPresent(row::getUpdateTime) + .set(remark).equalToWhenPresent(row::getRemark); + } + + default int updateByPrimaryKey(InvTransHis row) { + return update(c -> + c.set(deptId).equalTo(row::getDeptId) + .set(invTransType).equalTo(row::getInvTransType) + .set(whsCd).equalTo(row::getWhsCd) + .set(stgBinCd).equalTo(row::getStgBinCd) + .set(palletId).equalTo(row::getPalletId) + .set(stdUnitQty).equalTo(row::getStdUnitQty) + .set(pkgUnitQty).equalTo(row::getPkgUnitQty) + .set(transOrderNo).equalTo(row::getTransOrderNo) + .set(transOrderDetlNo).equalTo(row::getTransOrderDetlNo) + .set(operator).equalTo(row::getOperator) + .set(businessCls).equalTo(row::getBusinessCls) + .set(itemCd).equalTo(row::getItemCd) + .set(lotNo).equalTo(row::getLotNo) + .set(subLotNo).equalTo(row::getSubLotNo) + .set(serialNo).equalTo(row::getSerialNo) + .set(reason).equalTo(row::getReason) + .set(remark1).equalTo(row::getRemark1) + .set(remark2).equalTo(row::getRemark2) + .set(remark3).equalTo(row::getRemark3) + .set(remark4).equalTo(row::getRemark4) + .set(remark5).equalTo(row::getRemark5) + .set(updateCount).equalTo(row::getUpdateCount) + .set(deleteFlag).equalTo(row::getDeleteFlag) + .set(createBy).equalTo(row::getCreateBy) + .set(createTime).equalTo(row::getCreateTime) + .set(updateBy).equalTo(row::getUpdateBy) + .set(updateTime).equalTo(row::getUpdateTime) + .set(remark).equalTo(row::getRemark) + .where(invTransNo, isEqualTo(row::getInvTransNo)) + ); + } + + default int updateByPrimaryKeySelective(InvTransHis row) { + row.setCommonForUpdate(SecurityUtilsExt.getUserIdStr()); + return update(c -> + c.set(deptId).equalToWhenPresent(row::getDeptId) + .set(invTransType).equalToWhenPresent(row::getInvTransType) + .set(whsCd).equalToWhenPresent(row::getWhsCd) + .set(stgBinCd).equalToWhenPresent(row::getStgBinCd) + .set(palletId).equalToWhenPresent(row::getPalletId) + .set(stdUnitQty).equalToWhenPresent(row::getStdUnitQty) + .set(pkgUnitQty).equalToWhenPresent(row::getPkgUnitQty) + .set(transOrderNo).equalToWhenPresent(row::getTransOrderNo) + .set(transOrderDetlNo).equalToWhenPresent(row::getTransOrderDetlNo) + .set(operator).equalToWhenPresent(row::getOperator) + .set(businessCls).equalToWhenPresent(row::getBusinessCls) + .set(itemCd).equalToWhenPresent(row::getItemCd) + .set(lotNo).equalToWhenPresent(row::getLotNo) + .set(subLotNo).equalToWhenPresent(row::getSubLotNo) + .set(serialNo).equalToWhenPresent(row::getSerialNo) + .set(reason).equalToWhenPresent(row::getReason) + .set(remark1).equalToWhenPresent(row::getRemark1) + .set(remark2).equalToWhenPresent(row::getRemark2) + .set(remark3).equalToWhenPresent(row::getRemark3) + .set(remark4).equalToWhenPresent(row::getRemark4) + .set(remark5).equalToWhenPresent(row::getRemark5) + .set(updateCount).equalToWhenPresent(row::getUpdateCount) + .set(deleteFlag).equalToWhenPresent(row::getDeleteFlag) + .set(createBy).equalToWhenPresent(row::getCreateBy) + .set(createTime).equalToWhenPresent(row::getCreateTime) + .set(updateBy).equalToWhenPresent(row::getUpdateBy) + .set(updateTime).equalToWhenPresent(row::getUpdateTime) + .set(remark).equalToWhenPresent(row::getRemark) + .where(invTransNo, isEqualTo(row::getInvTransNo)) + ); + } +} \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/service/IItemInfoService.java b/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/service/master/IItemInfoService.java similarity index 97% rename from ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/service/IItemInfoService.java rename to ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/service/master/IItemInfoService.java index 056d319f..45ab1b39 100644 --- a/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/service/IItemInfoService.java +++ b/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/service/master/IItemInfoService.java @@ -1,4 +1,4 @@ -package com.ruoyi.wms.service; +package com.ruoyi.wms.service.master; import com.ruoyi.common.core.web.domain.AjaxResult; import com.ruoyi.wms.domain.ItemInfo; diff --git a/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/service/IItemTypeService.java b/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/service/master/IItemTypeService.java similarity index 97% rename from ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/service/IItemTypeService.java rename to ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/service/master/IItemTypeService.java index a5746746..c632e5e8 100644 --- a/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/service/IItemTypeService.java +++ b/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/service/master/IItemTypeService.java @@ -1,4 +1,4 @@ -package com.ruoyi.wms.service; +package com.ruoyi.wms.service.master; import com.ruoyi.wms.domain.ItemType; diff --git a/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/service/IUnitInfoService.java b/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/service/master/IUnitInfoService.java similarity index 97% rename from ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/service/IUnitInfoService.java rename to ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/service/master/IUnitInfoService.java index 7f77b231..bd36c1a5 100644 --- a/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/service/IUnitInfoService.java +++ b/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/service/master/IUnitInfoService.java @@ -1,4 +1,4 @@ -package com.ruoyi.wms.service; +package com.ruoyi.wms.service.master; import com.ruoyi.wms.domain.UnitInfo; diff --git a/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/service/IWarehouseInfoService.java b/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/service/master/IWarehouseInfoService.java similarity index 97% rename from ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/service/IWarehouseInfoService.java rename to ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/service/master/IWarehouseInfoService.java index f544d7fb..67148b90 100644 --- a/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/service/IWarehouseInfoService.java +++ b/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/service/master/IWarehouseInfoService.java @@ -1,4 +1,4 @@ -package com.ruoyi.wms.service; +package com.ruoyi.wms.service.master; import java.util.List; diff --git a/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/service/impl/ItemInfoServiceImpl.java b/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/service/master/ItemInfoServiceImpl.java similarity index 95% rename from ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/service/impl/ItemInfoServiceImpl.java rename to ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/service/master/ItemInfoServiceImpl.java index 4575b513..02bea0f1 100644 --- a/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/service/impl/ItemInfoServiceImpl.java +++ b/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/service/master/ItemInfoServiceImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.wms.service.impl; +package com.ruoyi.wms.service.master; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.utils.DateUtils; @@ -9,10 +9,9 @@ import com.ruoyi.common.security.utils.SecurityUtilsExt; import com.ruoyi.system.api.RemoteFileService; import com.ruoyi.system.api.domain.SysFileInfo; import com.ruoyi.wms.domain.ItemInfo; -import com.ruoyi.wms.mapper.ItemInfoDynamicSqlSupport; -import com.ruoyi.wms.mapper.ItemInfoExtMapper; -import com.ruoyi.wms.mapper.ItemInfoMapper; -import com.ruoyi.wms.service.IItemInfoService; +import com.ruoyi.wms.mapper.master.ItemInfoDynamicSqlSupport; +import com.ruoyi.wms.mapper.master.ItemInfoExtMapper; +import com.ruoyi.wms.mapper.master.ItemInfoMapper; import jakarta.annotation.Resource; import org.mybatis.dynamic.sql.SqlBuilder; import org.mybatis.dynamic.sql.render.RenderingStrategies; diff --git a/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/service/impl/ItemTypeServiceImpl.java b/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/service/master/ItemTypeServiceImpl.java similarity index 96% rename from ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/service/impl/ItemTypeServiceImpl.java rename to ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/service/master/ItemTypeServiceImpl.java index 61f1c788..b6bb0dc7 100644 --- a/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/service/impl/ItemTypeServiceImpl.java +++ b/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/service/master/ItemTypeServiceImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.wms.service.impl; +package com.ruoyi.wms.service.master; import com.ruoyi.common.core.utils.DateUtils; import com.ruoyi.common.core.utils.StringUtils; @@ -7,9 +7,8 @@ import com.ruoyi.common.security.utils.SecurityUtilsExt; import com.ruoyi.common.services.ISysSequenceService; import com.ruoyi.common.services.constants.SeqType; import com.ruoyi.wms.domain.ItemType; -import com.ruoyi.wms.mapper.ItemTypeDynamicSqlSupport; -import com.ruoyi.wms.mapper.ItemTypeMapper; -import com.ruoyi.wms.service.IItemTypeService; +import com.ruoyi.wms.mapper.master.ItemTypeDynamicSqlSupport; +import com.ruoyi.wms.mapper.master.ItemTypeMapper; import org.mybatis.dynamic.sql.SqlBuilder; import org.mybatis.dynamic.sql.render.RenderingStrategies; import org.mybatis.dynamic.sql.select.render.SelectStatementProvider; diff --git a/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/service/impl/UnitInfoServiceImpl.java b/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/service/master/UnitInfoServiceImpl.java similarity index 95% rename from ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/service/impl/UnitInfoServiceImpl.java rename to ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/service/master/UnitInfoServiceImpl.java index 57245ec3..f87d8f24 100644 --- a/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/service/impl/UnitInfoServiceImpl.java +++ b/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/service/master/UnitInfoServiceImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.wms.service.impl; +package com.ruoyi.wms.service.master; import com.ruoyi.common.core.utils.DateUtils; import com.ruoyi.common.core.utils.StringUtils; @@ -7,9 +7,8 @@ import com.ruoyi.common.security.utils.SecurityUtilsExt; import com.ruoyi.common.services.ISysSequenceService; import com.ruoyi.common.services.constants.SeqType; import com.ruoyi.wms.domain.UnitInfo; -import com.ruoyi.wms.mapper.UnitInfoDynamicSqlSupport; -import com.ruoyi.wms.mapper.UnitInfoMapper; -import com.ruoyi.wms.service.IUnitInfoService; +import com.ruoyi.wms.mapper.master.UnitInfoDynamicSqlSupport; +import com.ruoyi.wms.mapper.master.UnitInfoMapper; import jakarta.annotation.Resource; import org.mybatis.dynamic.sql.SqlBuilder; import org.mybatis.dynamic.sql.render.RenderingStrategies; diff --git a/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/service/impl/WarehouseInfoServiceImpl.java b/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/service/master/WarehouseInfoServiceImpl.java similarity index 95% rename from ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/service/impl/WarehouseInfoServiceImpl.java rename to ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/service/master/WarehouseInfoServiceImpl.java index 67c14f09..52bed7af 100644 --- a/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/service/impl/WarehouseInfoServiceImpl.java +++ b/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/service/master/WarehouseInfoServiceImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.wms.service.impl; +package com.ruoyi.wms.service.master; import com.ruoyi.common.core.utils.DateUtils; import com.ruoyi.common.core.utils.StringUtils; @@ -7,9 +7,8 @@ import com.ruoyi.common.security.utils.SecurityUtilsExt; import com.ruoyi.common.services.ISysSequenceService; import com.ruoyi.common.services.constants.SeqType; import com.ruoyi.wms.domain.WarehouseInfo; -import com.ruoyi.wms.mapper.WarehouseInfoDynamicSqlSupport; -import com.ruoyi.wms.mapper.WarehouseInfoMapper; -import com.ruoyi.wms.service.IWarehouseInfoService; +import com.ruoyi.wms.mapper.master.WarehouseInfoDynamicSqlSupport; +import com.ruoyi.wms.mapper.master.WarehouseInfoMapper; import jakarta.annotation.Resource; import org.mybatis.dynamic.sql.SqlBuilder; import org.mybatis.dynamic.sql.render.RenderingStrategies; diff --git a/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/service/stock/BaseStockServiceImpl.java b/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/service/stock/BaseStockServiceImpl.java new file mode 100644 index 00000000..3beda454 --- /dev/null +++ b/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/service/stock/BaseStockServiceImpl.java @@ -0,0 +1,60 @@ +package com.ruoyi.wms.service.stock; + +import com.ruoyi.common.core.web.domain.ExtBaseEntity; +import com.ruoyi.wms.domain.BaseStock; +import com.ruoyi.wms.mapper.stock.BaseStockDynamicSqlSupport; +import com.ruoyi.wms.mapper.stock.BaseStockMapper; +import org.mybatis.dynamic.sql.SqlBuilder; +import org.mybatis.dynamic.sql.render.RenderingStrategies; +import org.mybatis.dynamic.sql.select.render.SelectStatementProvider; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Optional; + +/** + * 基本库存Service业务层处理 + * + * @author ryas + * created on 2024-02-22 + */ +@Service +public class BaseStockServiceImpl implements IBaseStockService { + @Autowired + private BaseStockMapper baseStockMapper; + + /** + * 查询基本库存 + * + * @param whsCd 基本库存主键 + * @return 基本库存 + */ + @Override + public BaseStock selectBaseStockByWhsCd(String whsCd) { + Optional result = baseStockMapper.selectOne(dsl -> dsl.where(BaseStockDynamicSqlSupport.whsCd, SqlBuilder.isEqualTo(whsCd))); + return result.orElse(null); + } + + /** + * 查询基本库存列表 + * + * @param baseStock 基本库存 + * @return 基本库存 + */ + @Override + public List selectBaseStockList(BaseStock baseStock) { + SelectStatementProvider provider = SqlBuilder.select(BaseStockMapper.selectList) + .from(BaseStockDynamicSqlSupport.baseStock) + .where(BaseStockDynamicSqlSupport.deleteFlag, SqlBuilder.isEqualTo(ExtBaseEntity.NOT_DELETE)) + .and(BaseStockDynamicSqlSupport.whsCd, SqlBuilder.isEqualToWhenPresent(baseStock.getWhsCd())) + .and(BaseStockDynamicSqlSupport.stgBinCd, SqlBuilder.isEqualToWhenPresent(baseStock.getStgBinCd())) + .and(BaseStockDynamicSqlSupport.itemCd, SqlBuilder.isLikeWhenPresent(baseStock.getItemCd() == null ? null : "%" + baseStock.getItemCd() + "%")) + .and(BaseStockDynamicSqlSupport.lotNo, SqlBuilder.isLikeWhenPresent(baseStock.getLotNo() == null ? null : "%" + baseStock.getLotNo() + "%")) + .orderBy(BaseStockDynamicSqlSupport.whsCd) + .build() + .render(RenderingStrategies.MYBATIS3); + return baseStockMapper.selectMany(provider); + } + +} diff --git a/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/service/stock/IBaseStockService.java b/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/service/stock/IBaseStockService.java new file mode 100644 index 00000000..0cf6c0c1 --- /dev/null +++ b/ruoyi-modules/ruoyi-wms/src/main/java/com/ruoyi/wms/service/stock/IBaseStockService.java @@ -0,0 +1,30 @@ +package com.ruoyi.wms.service.stock; + +import com.ruoyi.wms.domain.BaseStock; + +import java.util.List; + +/** + * 基本库存Service接口 + * + * @author ryas + * created on 2024-02-22 + */ +public interface IBaseStockService { + /** + * 查询基本库存 + * + * @param whsCd 基本库存主键 + * @return 基本库存 + */ + BaseStock selectBaseStockByWhsCd(String whsCd); + + /** + * 查询基本库存列表 + * + * @param baseStock 基本库存 + * @return 基本库存集合 + */ + List selectBaseStockList(BaseStock baseStock); + +} diff --git a/ruoyi-modules/ruoyi-wms/src/main/resources/com/ruoyi/wms/mapper/BaseStockExtMapper.xml b/ruoyi-modules/ruoyi-wms/src/main/resources/com/ruoyi/wms/mapper/BaseStockExtMapper.xml new file mode 100644 index 00000000..6882cb36 --- /dev/null +++ b/ruoyi-modules/ruoyi-wms/src/main/resources/com/ruoyi/wms/mapper/BaseStockExtMapper.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-wms/src/main/resources/com/ruoyi/wms/mapper/ItemInfoExtMapper.xml b/ruoyi-modules/ruoyi-wms/src/main/resources/com/ruoyi/wms/mapper/ItemInfoExtMapper.xml index 178e79f3..ebfba3e1 100644 --- a/ruoyi-modules/ruoyi-wms/src/main/resources/com/ruoyi/wms/mapper/ItemInfoExtMapper.xml +++ b/ruoyi-modules/ruoyi-wms/src/main/resources/com/ruoyi/wms/mapper/ItemInfoExtMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/ruoyi-modules/ruoyi-wms/src/test/resources/generatorConfig.xml b/ruoyi-modules/ruoyi-wms/src/test/resources/generatorConfig.xml index 6aea8e3b..8e579fc8 100644 --- a/ruoyi-modules/ruoyi-wms/src/test/resources/generatorConfig.xml +++ b/ruoyi-modules/ruoyi-wms/src/test/resources/generatorConfig.xml @@ -43,7 +43,9 @@ - + +
+
\ No newline at end of file diff --git a/ruoyi-ui/src/api/wms/BaseStock.js b/ruoyi-ui/src/api/wms/BaseStock.js new file mode 100644 index 00000000..20039652 --- /dev/null +++ b/ruoyi-ui/src/api/wms/BaseStock.js @@ -0,0 +1,18 @@ +import request from '@/utils/request' + +// 查询基本库存列表 +export function listBaseStock(query) { + return request({ + url: '/wms/BaseStock/list', + method: 'get', + params: query + }) +} + +// TODO 查询基本库存详细 主键需要注意 +export function getBaseStock(whsCd) { + return request({ + url: '/wms/BaseStock/' + whsCd, + method: 'get' + }) +} diff --git a/ruoyi-ui/src/views/wms/BaseStock/index.vue b/ruoyi-ui/src/views/wms/BaseStock/index.vue new file mode 100644 index 00000000..6a0308dc --- /dev/null +++ b/ruoyi-ui/src/views/wms/BaseStock/index.vue @@ -0,0 +1,266 @@ + + + diff --git a/sql/ry-cloud-ryas.sql b/sql/ry-cloud-ryas.sql index 3258dd0f..74dc4684 100644 --- a/sql/ry-cloud-ryas.sql +++ b/sql/ry-cloud-ryas.sql @@ -11,12 +11,88 @@ Target Server Version : 80200 (8.2.0) File Encoding : 65001 - Date: 22/02/2024 11:11:32 + Date: 22/02/2024 18:10:55 */ SET NAMES utf8mb4; SET FOREIGN_KEY_CHECKS = 0; +-- ---------------------------- +-- Table structure for WMS_B_BASE_STOCK +-- ---------------------------- +DROP TABLE IF EXISTS `WMS_B_BASE_STOCK`; +CREATE TABLE `WMS_B_BASE_STOCK` ( + `DEPT_ID` int NOT NULL COMMENT '从属部门ID', + `WHS_CD` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '仓库代码', + `STG_BIN_CD` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '货架号', + `ITEM_CD` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '物品代码', + `LOT_NO` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '批号', + `SUB_LOT_NO` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '子批号', + `STD_UNIT_QTY` decimal(18, 6) NOT NULL COMMENT '标准单位数量', + `PKG_UNIT_QTY` decimal(18, 6) NOT NULL DEFAULT 0.000000 COMMENT '包装单位数量', + `SERIAL_NO` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '序列号', + `PALLET_ID` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '托盘ID', + `PARENT_PALLET_ID` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '父托盘ID', + `REMARK_1` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '备注1', + `REMARK_2` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '备注2', + `REMARK_3` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '备注3', + `REMARK_4` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '备注4', + `REMARK_5` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '备注5', + `UPDATE_COUNT` int NOT NULL DEFAULT 0 COMMENT '更新次数', + `DELETE_FLAG` int NOT NULL DEFAULT 0 COMMENT '删除标志', + `create_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT '' COMMENT '创建者', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', + `update_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT '' COMMENT '更新者', + `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间', + `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '备注', + PRIMARY KEY (`WHS_CD`, `STG_BIN_CD`, `ITEM_CD`, `LOT_NO`, `SUB_LOT_NO`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '基本库存表' ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Records of WMS_B_BASE_STOCK +-- ---------------------------- + +-- ---------------------------- +-- Table structure for WMS_B_INV_TRANS_HIS +-- ---------------------------- +DROP TABLE IF EXISTS `WMS_B_INV_TRANS_HIS`; +CREATE TABLE `WMS_B_INV_TRANS_HIS` ( + `DEPT_ID` int NOT NULL DEFAULT 100 COMMENT '从属部门ID', + `INV_TRANS_NO` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '入出库履历号', + `INV_TRANS_TYPE` int NOT NULL COMMENT '入出库类型(1:入库,2:出库)', + `WHS_CD` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '仓库代码', + `STG_BIN_CD` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '货架号', + `PALLET_ID` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '托盘ID', + `STD_UNIT_QTY` decimal(18, 6) NOT NULL COMMENT '标准单位数量', + `PKG_UNIT_QTY` decimal(18, 6) NOT NULL DEFAULT 0.000000 COMMENT '包装单位数量', + `TRANS_ORDER_NO` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '交易单号', + `TRANS_ORDER_DETL_NO` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '交易单明细号', + `OPERATOR` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '操作员', + `BUSINESS_CLS` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT '0' COMMENT '业务区分', + `ITEM_CD` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '物品代码', + `LOT_NO` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '批号', + `SUB_LOT_NO` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '子批号', + `SERIAL_NO` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '序列号', + `REASON` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '入出库理由', + `REMARK_1` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '备注1', + `REMARK_2` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '备注2', + `REMARK_3` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '备注3', + `REMARK_4` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '备注4', + `REMARK_5` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '备注5', + `UPDATE_COUNT` int NOT NULL DEFAULT 0 COMMENT '更新次数', + `DELETE_FLAG` int NOT NULL DEFAULT 0 COMMENT '删除标志', + `create_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT '' COMMENT '创建者', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', + `update_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT '' COMMENT '更新者', + `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间', + `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '备注', + PRIMARY KEY (`INV_TRANS_NO`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '入出库履历表' ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Records of WMS_B_INV_TRANS_HIS +-- ---------------------------- + -- ---------------------------- -- Table structure for WMS_M_ITEM_INFO -- ---------------------------- @@ -156,7 +232,7 @@ INSERT INTO `WMS_M_UNIT_INFO` VALUES (100, 'UNIT00009', '颗', NULL, NULL, NULL, DROP TABLE IF EXISTS `WMS_M_WAREHOUSE_INFO`; CREATE TABLE `WMS_M_WAREHOUSE_INFO` ( `DEPT_ID` int NOT NULL DEFAULT 100 COMMENT '从属部门ID', - `WHS_CD` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '仓库代码', + `WHS_CD` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '仓库代码', `WHS_NAME` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '仓库名称', `WHS_TYPE_CD` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '仓库类型代码', `ABBR` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '缩写', @@ -219,7 +295,7 @@ CREATE TABLE `gen_table` ( `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间', `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '备注', PRIMARY KEY (`table_id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 17 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '代码生成业务表' ROW_FORMAT = DYNAMIC; +) ENGINE = InnoDB AUTO_INCREMENT = 19 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '代码生成业务表' ROW_FORMAT = DYNAMIC; -- ---------------------------- -- Records of gen_table @@ -230,6 +306,8 @@ INSERT INTO `gen_table` VALUES (13, 'sys_file', '文件存储记录表', NULL, N INSERT INTO `gen_table` VALUES (14, 'sys_seq_rule', '序列号生成规则表', NULL, NULL, 'SysSeqRule', 'crud', 'element-plus', 'mybatis-dynamic', 'com.ruoyi.system', 'system', 'SeqRule', '序列号生成规则', 'ryas', '0', '/', '{\"parentMenuId\":1}', 'admin', '2024-02-19 10:01:22', '', '2024-02-20 02:07:26', NULL); INSERT INTO `gen_table` VALUES (15, 'WMS_M_ITEM_TYPE', '物品类型表', NULL, NULL, 'ItemType', 'crud', 'element-plus', 'mybatis-dynamic', 'com.ruoyi.wms', 'wms', 'ItemType', '物品类型', 'ryas', '0', '/', '{\"parentMenuId\":2000}', 'admin', '2024-02-20 07:11:35', '', '2024-02-20 07:13:11', NULL); INSERT INTO `gen_table` VALUES (16, 'WMS_M_ITEM_INFO', '物品基础信息表', NULL, NULL, 'ItemInfo', 'crud', 'element-plus', 'normal', 'com.ruoyi.wms', 'wms', 'ItemInfo', '物品基础信息', 'ryas', '0', '/', '{\"parentMenuId\":\"2000\"}', 'admin', '2024-02-20 08:25:28', '', '2024-02-21 02:00:27', NULL); +INSERT INTO `gen_table` VALUES (17, 'WMS_B_BASE_STOCK', '基本库存表', NULL, NULL, 'BaseStock', 'crud', 'element-plus', 'mybatis-dynamic', 'com.ruoyi.wms', 'wms', 'BaseStock', '基本库存', 'ryas', '0', '/', '{\"parentMenuId\":\"2043\"}', 'admin', '2024-02-22 05:49:52', '', '2024-02-22 09:30:30', NULL); +INSERT INTO `gen_table` VALUES (18, 'WMS_B_INV_TRANS_HIS', '入出库履历表', NULL, NULL, 'InvTransHis', 'crud', 'element-plus', 'mybatis-dynamic', 'com.ruoyi.wms', 'wms', 'InvTransHis', '入出库履历', 'ryas', '0', '/', '{\"parentMenuId\":\"2043\"}', 'admin', '2024-02-22 05:49:53', '', '2024-02-22 09:30:40', NULL); -- ---------------------------- -- Table structure for gen_table_column @@ -259,7 +337,7 @@ CREATE TABLE `gen_table_column` ( `update_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT '' COMMENT '更新者', `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间', PRIMARY KEY (`column_id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 328 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '代码生成业务表字段' ROW_FORMAT = DYNAMIC; +) ENGINE = InnoDB AUTO_INCREMENT = 380 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '代码生成业务表字段' ROW_FORMAT = DYNAMIC; -- ---------------------------- -- Records of gen_table_column @@ -409,6 +487,58 @@ INSERT INTO `gen_table_column` VALUES (324, 16, 'STG_RQMT_DESC', '储存要求 INSERT INTO `gen_table_column` VALUES (325, 16, 'MANUFACTURER', '生产商', 'varchar(100)', 'String', 'manufacturer', '0', '0', NULL, '1', '1', '1', '0', 'EQ', 'input', '', 52, 'admin', '2024-02-20 08:25:30', '', '2024-02-21 02:00:28'); INSERT INTO `gen_table_column` VALUES (326, 16, 'PICTURE_ID', '图片ID', 'varchar(50)', 'String', 'pictureId', '0', '0', NULL, '1', '1', '0', '0', 'EQ', 'input', '', 53, 'admin', '2024-02-20 08:25:30', '', '2024-02-21 02:00:28'); INSERT INTO `gen_table_column` VALUES (327, 16, 'PICTURE_URL', '图片URL', 'varchar(255)', 'String', 'pictureUrl', '0', '0', NULL, '0', '0', '0', '0', 'EQ', 'input', '', 54, 'admin', '2024-02-20 08:25:30', '', '2024-02-21 02:00:28'); +INSERT INTO `gen_table_column` VALUES (328, 17, 'DEPT_ID', '从属部门ID', 'int', 'Long', 'deptId', '0', '0', '0', NULL, NULL, NULL, NULL, 'EQ', 'input', '', 1, 'admin', '2024-02-22 05:49:52', '', '2024-02-22 09:30:30'); +INSERT INTO `gen_table_column` VALUES (329, 17, 'WHS_CD', '仓库代码', 'varchar(30)', 'String', 'whsCd', '1', '0', NULL, '0', '0', '1', '1', 'EQ', 'input', '', 2, 'admin', '2024-02-22 05:49:52', '', '2024-02-22 09:30:30'); +INSERT INTO `gen_table_column` VALUES (330, 17, 'STG_BIN_CD', '货架号', 'varchar(30)', 'String', 'stgBinCd', '1', '0', NULL, '0', '0', '1', '1', 'EQ', 'input', '', 3, 'admin', '2024-02-22 05:49:52', '', '2024-02-22 09:30:30'); +INSERT INTO `gen_table_column` VALUES (331, 17, 'ITEM_CD', '物品代码', 'varchar(30)', 'String', 'itemCd', '1', '0', '0', '0', '0', '1', '1', 'LIKE', 'input', '', 4, 'admin', '2024-02-22 05:49:52', '', '2024-02-22 09:30:30'); +INSERT INTO `gen_table_column` VALUES (332, 17, 'LOT_NO', '批号', 'varchar(100)', 'String', 'lotNo', '1', '0', '0', '0', '0', '1', '1', 'LIKE', 'input', '', 5, 'admin', '2024-02-22 05:49:52', '', '2024-02-22 09:30:30'); +INSERT INTO `gen_table_column` VALUES (333, 17, 'SUB_LOT_NO', '子批号', 'varchar(25)', 'String', 'subLotNo', '1', '0', NULL, '0', '0', '1', NULL, 'EQ', 'input', '', 6, 'admin', '2024-02-22 05:49:53', '', '2024-02-22 09:30:30'); +INSERT INTO `gen_table_column` VALUES (334, 17, 'STD_UNIT_QTY', '标准单位数量', 'decimal(18,6)', 'BigDecimal', 'stdUnitQty', '0', '0', '0', '0', '0', '1', '0', 'EQ', 'input', '', 7, 'admin', '2024-02-22 05:49:53', '', '2024-02-22 09:30:30'); +INSERT INTO `gen_table_column` VALUES (335, 17, 'PKG_UNIT_QTY', '包装单位数量', 'decimal(18,6)', 'BigDecimal', 'pkgUnitQty', '0', '0', '0', '0', '0', '1', '0', 'EQ', 'input', '', 8, 'admin', '2024-02-22 05:49:53', '', '2024-02-22 09:30:30'); +INSERT INTO `gen_table_column` VALUES (336, 17, 'SERIAL_NO', '序列号', 'varchar(30)', 'String', 'serialNo', '0', '0', NULL, '0', '0', '1', '0', 'EQ', 'input', '', 9, 'admin', '2024-02-22 05:49:53', '', '2024-02-22 09:30:30'); +INSERT INTO `gen_table_column` VALUES (337, 17, 'PALLET_ID', '托盘ID', 'varchar(30)', 'String', 'palletId', '0', '0', NULL, '0', '0', '1', '0', 'EQ', 'input', '', 10, 'admin', '2024-02-22 05:49:53', '', '2024-02-22 09:30:30'); +INSERT INTO `gen_table_column` VALUES (338, 17, 'PARENT_PALLET_ID', '父托盘ID', 'varchar(30)', 'String', 'parentPalletId', '0', '0', NULL, '0', '0', '1', '0', 'EQ', 'input', '', 11, 'admin', '2024-02-22 05:49:53', '', '2024-02-22 09:30:30'); +INSERT INTO `gen_table_column` VALUES (339, 17, 'REMARK_1', '备注1', 'varchar(100)', 'String', 'remark1', '0', '0', NULL, NULL, NULL, NULL, NULL, 'EQ', 'input', '', 12, 'admin', '2024-02-22 05:49:53', '', '2024-02-22 09:30:30'); +INSERT INTO `gen_table_column` VALUES (340, 17, 'REMARK_2', '备注2', 'varchar(100)', 'String', 'remark2', '0', '0', NULL, NULL, NULL, NULL, NULL, 'EQ', 'input', '', 13, 'admin', '2024-02-22 05:49:53', '', '2024-02-22 09:30:30'); +INSERT INTO `gen_table_column` VALUES (341, 17, 'REMARK_3', '备注3', 'varchar(100)', 'String', 'remark3', '0', '0', NULL, NULL, NULL, NULL, NULL, 'EQ', 'input', '', 14, 'admin', '2024-02-22 05:49:53', '', '2024-02-22 09:30:30'); +INSERT INTO `gen_table_column` VALUES (342, 17, 'REMARK_4', '备注4', 'varchar(100)', 'String', 'remark4', '0', '0', NULL, NULL, NULL, NULL, NULL, 'EQ', 'input', '', 15, 'admin', '2024-02-22 05:49:53', '', '2024-02-22 09:30:30'); +INSERT INTO `gen_table_column` VALUES (343, 17, 'REMARK_5', '备注5', 'varchar(100)', 'String', 'remark5', '0', '0', NULL, NULL, NULL, NULL, NULL, 'EQ', 'input', '', 16, 'admin', '2024-02-22 05:49:53', '', '2024-02-22 09:30:30'); +INSERT INTO `gen_table_column` VALUES (344, 17, 'UPDATE_COUNT', '更新次数', 'int', 'Long', 'updateCount', '0', '0', '0', NULL, NULL, NULL, NULL, 'EQ', 'input', '', 17, 'admin', '2024-02-22 05:49:53', '', '2024-02-22 09:30:30'); +INSERT INTO `gen_table_column` VALUES (345, 17, 'DELETE_FLAG', '删除标志', 'int', 'Long', 'deleteFlag', '0', '0', '0', NULL, NULL, NULL, NULL, 'EQ', 'input', '', 18, 'admin', '2024-02-22 05:49:53', '', '2024-02-22 09:30:30'); +INSERT INTO `gen_table_column` VALUES (346, 17, 'create_by', '创建者', 'varchar(64)', 'String', 'createBy', '0', '0', NULL, NULL, NULL, NULL, NULL, 'EQ', 'input', '', 19, 'admin', '2024-02-22 05:49:53', '', '2024-02-22 09:30:30'); +INSERT INTO `gen_table_column` VALUES (347, 17, 'create_time', '创建时间', 'datetime', 'Date', 'createTime', '0', '0', NULL, NULL, NULL, NULL, NULL, 'EQ', 'datetime', '', 20, 'admin', '2024-02-22 05:49:53', '', '2024-02-22 09:30:30'); +INSERT INTO `gen_table_column` VALUES (348, 17, 'update_by', '更新者', 'varchar(64)', 'String', 'updateBy', '0', '0', NULL, NULL, NULL, NULL, NULL, 'EQ', 'input', '', 21, 'admin', '2024-02-22 05:49:53', '', '2024-02-22 09:30:30'); +INSERT INTO `gen_table_column` VALUES (349, 17, 'update_time', '更新时间', 'datetime', 'Date', 'updateTime', '0', '0', NULL, NULL, NULL, NULL, NULL, 'EQ', 'datetime', '', 22, 'admin', '2024-02-22 05:49:53', '', '2024-02-22 09:30:30'); +INSERT INTO `gen_table_column` VALUES (350, 17, 'remark', '备注', 'varchar(500)', 'String', 'remark', '0', '0', NULL, NULL, NULL, NULL, NULL, 'EQ', 'textarea', '', 23, 'admin', '2024-02-22 05:49:53', '', '2024-02-22 09:30:30'); +INSERT INTO `gen_table_column` VALUES (351, 18, 'DEPT_ID', '从属部门ID', 'int', 'Long', 'deptId', '0', '0', '0', NULL, NULL, NULL, NULL, 'EQ', 'input', '', 1, 'admin', '2024-02-22 05:49:53', '', '2024-02-22 09:30:41'); +INSERT INTO `gen_table_column` VALUES (352, 18, 'INV_TRANS_NO', '入出库履历号', 'varchar(30)', 'String', 'invTransNo', '1', '0', NULL, '0', NULL, '1', '0', 'EQ', 'input', '', 2, 'admin', '2024-02-22 05:49:53', '', '2024-02-22 09:30:41'); +INSERT INTO `gen_table_column` VALUES (353, 18, 'INV_TRANS_TYPE', '入出库类型(1:入库,2:出库)', 'int', 'Long', 'invTransType', '0', '0', '0', '0', '0', '1', '1', 'EQ', 'select', '', 3, 'admin', '2024-02-22 05:49:53', '', '2024-02-22 09:30:41'); +INSERT INTO `gen_table_column` VALUES (354, 18, 'WHS_CD', '仓库代码', 'varchar(30)', 'String', 'whsCd', '0', '0', '0', '0', '0', '1', '1', 'EQ', 'input', '', 4, 'admin', '2024-02-22 05:49:53', '', '2024-02-22 09:30:41'); +INSERT INTO `gen_table_column` VALUES (355, 18, 'STG_BIN_CD', '货架号', 'varchar(30)', 'String', 'stgBinCd', '0', '0', '0', '0', '0', '1', '1', 'EQ', 'input', '', 5, 'admin', '2024-02-22 05:49:53', '', '2024-02-22 09:30:41'); +INSERT INTO `gen_table_column` VALUES (356, 18, 'PALLET_ID', '托盘ID', 'varchar(30)', 'String', 'palletId', '0', '0', NULL, '0', '0', '0', '0', 'EQ', 'input', '', 6, 'admin', '2024-02-22 05:49:53', '', '2024-02-22 09:30:41'); +INSERT INTO `gen_table_column` VALUES (357, 18, 'STD_UNIT_QTY', '标准单位数量', 'decimal(18,6)', 'BigDecimal', 'stdUnitQty', '0', '0', '0', '0', '0', '1', '0', 'EQ', 'input', '', 7, 'admin', '2024-02-22 05:49:53', '', '2024-02-22 09:30:41'); +INSERT INTO `gen_table_column` VALUES (358, 18, 'PKG_UNIT_QTY', '包装单位数量', 'decimal(18,6)', 'BigDecimal', 'pkgUnitQty', '0', '0', '0', '0', '0', '1', '0', 'EQ', 'input', '', 8, 'admin', '2024-02-22 05:49:53', '', '2024-02-22 09:30:41'); +INSERT INTO `gen_table_column` VALUES (359, 18, 'TRANS_ORDER_NO', '交易单号', 'varchar(30)', 'String', 'transOrderNo', '0', '0', NULL, '0', '0', '0', '0', 'EQ', 'input', '', 9, 'admin', '2024-02-22 05:49:53', '', '2024-02-22 09:30:41'); +INSERT INTO `gen_table_column` VALUES (360, 18, 'TRANS_ORDER_DETL_NO', '交易单明细号', 'varchar(30)', 'String', 'transOrderDetlNo', '0', '0', NULL, '0', '0', '0', '0', 'EQ', 'input', '', 10, 'admin', '2024-02-22 05:49:53', '', '2024-02-22 09:30:41'); +INSERT INTO `gen_table_column` VALUES (361, 18, 'OPERATOR', '操作员', 'varchar(25)', 'String', 'operator', '0', '0', NULL, '0', '0', '0', '0', 'EQ', 'input', '', 11, 'admin', '2024-02-22 05:49:53', '', '2024-02-22 09:30:41'); +INSERT INTO `gen_table_column` VALUES (362, 18, 'BUSINESS_CLS', '业务区分', 'varchar(10)', 'String', 'businessCls', '0', '0', '0', '0', '0', '1', '0', 'EQ', 'input', '', 12, 'admin', '2024-02-22 05:49:53', '', '2024-02-22 09:30:41'); +INSERT INTO `gen_table_column` VALUES (363, 18, 'ITEM_CD', '物品代码', 'varchar(30)', 'String', 'itemCd', '0', '0', '0', '0', '0', '1', '1', 'LIKE', 'input', '', 13, 'admin', '2024-02-22 05:49:54', '', '2024-02-22 09:30:41'); +INSERT INTO `gen_table_column` VALUES (364, 18, 'LOT_NO', '批号', 'varchar(100)', 'String', 'lotNo', '0', '0', NULL, '0', '0', '1', '1', 'LIKE', 'input', '', 14, 'admin', '2024-02-22 05:49:54', '', '2024-02-22 09:30:41'); +INSERT INTO `gen_table_column` VALUES (365, 18, 'SUB_LOT_NO', '子批号', 'varchar(25)', 'String', 'subLotNo', '0', '0', NULL, '0', '0', '0', '0', 'EQ', 'input', '', 15, 'admin', '2024-02-22 05:49:54', '', '2024-02-22 09:30:41'); +INSERT INTO `gen_table_column` VALUES (366, 18, 'SERIAL_NO', '序列号', 'varchar(50)', 'String', 'serialNo', '0', '0', NULL, '0', '0', '0', '0', 'EQ', 'input', '', 16, 'admin', '2024-02-22 05:49:54', '', '2024-02-22 09:30:41'); +INSERT INTO `gen_table_column` VALUES (367, 18, 'REASON', '入出库理由', 'varchar(255)', 'String', 'reason', '0', '0', NULL, '0', '0', '0', '0', 'EQ', 'input', '', 17, 'admin', '2024-02-22 05:49:54', '', '2024-02-22 09:30:41'); +INSERT INTO `gen_table_column` VALUES (368, 18, 'REMARK_1', '备注1', 'varchar(100)', 'String', 'remark1', '0', '0', NULL, NULL, NULL, NULL, NULL, 'EQ', 'input', '', 18, 'admin', '2024-02-22 05:49:54', '', '2024-02-22 09:30:41'); +INSERT INTO `gen_table_column` VALUES (369, 18, 'REMARK_2', '备注2', 'varchar(100)', 'String', 'remark2', '0', '0', NULL, NULL, NULL, NULL, NULL, 'EQ', 'input', '', 19, 'admin', '2024-02-22 05:49:54', '', '2024-02-22 09:30:41'); +INSERT INTO `gen_table_column` VALUES (370, 18, 'REMARK_3', '备注3', 'varchar(100)', 'String', 'remark3', '0', '0', NULL, NULL, NULL, NULL, NULL, 'EQ', 'input', '', 20, 'admin', '2024-02-22 05:49:54', '', '2024-02-22 09:30:41'); +INSERT INTO `gen_table_column` VALUES (371, 18, 'REMARK_4', '备注4', 'varchar(100)', 'String', 'remark4', '0', '0', NULL, NULL, NULL, NULL, NULL, 'EQ', 'input', '', 21, 'admin', '2024-02-22 05:49:54', '', '2024-02-22 09:30:41'); +INSERT INTO `gen_table_column` VALUES (372, 18, 'REMARK_5', '备注5', 'varchar(100)', 'String', 'remark5', '0', '0', NULL, NULL, NULL, NULL, NULL, 'EQ', 'input', '', 22, 'admin', '2024-02-22 05:49:54', '', '2024-02-22 09:30:41'); +INSERT INTO `gen_table_column` VALUES (373, 18, 'UPDATE_COUNT', '更新次数', 'int', 'Long', 'updateCount', '0', '0', '0', NULL, NULL, NULL, NULL, 'EQ', 'input', '', 23, 'admin', '2024-02-22 05:49:54', '', '2024-02-22 09:30:41'); +INSERT INTO `gen_table_column` VALUES (374, 18, 'DELETE_FLAG', '删除标志', 'int', 'Long', 'deleteFlag', '0', '0', '0', NULL, NULL, NULL, NULL, 'EQ', 'input', '', 24, 'admin', '2024-02-22 05:49:54', '', '2024-02-22 09:30:41'); +INSERT INTO `gen_table_column` VALUES (375, 18, 'create_by', '创建者', 'varchar(64)', 'String', 'createBy', '0', '0', NULL, NULL, NULL, NULL, NULL, 'EQ', 'input', '', 25, 'admin', '2024-02-22 05:49:54', '', '2024-02-22 09:30:41'); +INSERT INTO `gen_table_column` VALUES (376, 18, 'create_time', '创建时间', 'datetime', 'Date', 'createTime', '0', '0', NULL, NULL, NULL, NULL, NULL, 'EQ', 'datetime', '', 26, 'admin', '2024-02-22 05:49:54', '', '2024-02-22 09:30:41'); +INSERT INTO `gen_table_column` VALUES (377, 18, 'update_by', '更新者', 'varchar(64)', 'String', 'updateBy', '0', '0', NULL, NULL, NULL, NULL, NULL, 'EQ', 'input', '', 27, 'admin', '2024-02-22 05:49:54', '', '2024-02-22 09:30:41'); +INSERT INTO `gen_table_column` VALUES (378, 18, 'update_time', '更新时间', 'datetime', 'Date', 'updateTime', '0', '0', NULL, NULL, NULL, NULL, NULL, 'EQ', 'datetime', '', 28, 'admin', '2024-02-22 05:49:54', '', '2024-02-22 09:30:41'); +INSERT INTO `gen_table_column` VALUES (379, 18, 'remark', '备注', 'varchar(500)', 'String', 'remark', '0', '0', NULL, NULL, NULL, NULL, NULL, 'EQ', 'textarea', '', 29, 'admin', '2024-02-22 05:49:54', '', '2024-02-22 09:30:41'); -- ---------------------------- -- Table structure for sys_config @@ -676,7 +806,7 @@ CREATE TABLE `sys_logininfor` ( PRIMARY KEY (`info_id`) USING BTREE, INDEX `idx_sys_logininfor_s`(`status` ASC) USING BTREE, INDEX `idx_sys_logininfor_lt`(`access_time` ASC) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 151 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '系统访问记录' ROW_FORMAT = Dynamic; +) ENGINE = InnoDB AUTO_INCREMENT = 152 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '系统访问记录' ROW_FORMAT = Dynamic; -- ---------------------------- -- Records of sys_logininfor @@ -707,7 +837,7 @@ CREATE TABLE `sys_menu` ( `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间', `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT '' COMMENT '备注', PRIMARY KEY (`menu_id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 2043 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '菜单权限表' ROW_FORMAT = Dynamic; +) ENGINE = InnoDB AUTO_INCREMENT = 2049 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '菜单权限表' ROW_FORMAT = Dynamic; -- ---------------------------- -- Records of sys_menu @@ -832,6 +962,12 @@ INSERT INTO `sys_menu` VALUES (2039, '物品基础信息新增', 2037, 2, '#', ' INSERT INTO `sys_menu` VALUES (2040, '物品基础信息修改', 2037, 3, '#', '', NULL, 1, 0, 'F', '0', '0', 'wms:ItemInfo:edit', '#', 'admin', '2024-02-20 08:34:17', '', NULL, ''); INSERT INTO `sys_menu` VALUES (2041, '物品基础信息删除', 2037, 4, '#', '', NULL, 1, 0, 'F', '0', '0', 'wms:ItemInfo:remove', '#', 'admin', '2024-02-20 08:34:17', '', NULL, ''); INSERT INTO `sys_menu` VALUES (2042, '物品基础信息导出', 2037, 5, '#', '', NULL, 1, 0, 'F', '0', '0', 'wms:ItemInfo:export', '#', 'admin', '2024-02-20 08:34:17', '', NULL, ''); +INSERT INTO `sys_menu` VALUES (2043, '库存管理', 0, 30, 'StockMgmt', NULL, NULL, 1, 0, 'M', '0', '0', '', 'warehouse', '1', '2024-02-22 05:57:55', '1', '2024-02-22 05:58:05', ''); +INSERT INTO `sys_menu` VALUES (2044, '基本库存信息', 2043, 1, 'BaseStock', 'wms/BaseStock/index', NULL, 1, 0, 'C', '0', '0', 'wms:BaseStock:list', 'cubes-stacked', 'admin', '2024-02-22 09:43:17', '1', '2024-02-22 09:44:13', '基本库存菜单'); +INSERT INTO `sys_menu` VALUES (2045, '基本库存查询', 2044, 1, '#', '', NULL, 1, 0, 'F', '0', '0', 'wms:BaseStock:query', '#', 'admin', '2024-02-22 09:43:17', '', NULL, ''); +INSERT INTO `sys_menu` VALUES (2046, '入库', 2044, 2, '#', '', NULL, 1, 0, 'F', '0', '0', 'wms:BaseStock:instock', '#', 'admin', '2024-02-22 09:43:17', '', NULL, ''); +INSERT INTO `sys_menu` VALUES (2047, '出库', 2044, 3, '#', '', NULL, 1, 0, 'F', '0', '0', 'wms:BaseStock:outstock', '#', 'admin', '2024-02-22 09:43:17', '', NULL, ''); +INSERT INTO `sys_menu` VALUES (2048, '基本库存导出', 2044, 4, '#', '', NULL, 1, 0, 'F', '0', '0', 'wms:BaseStock:export', '#', 'admin', '2024-02-22 09:43:17', '', NULL, ''); -- ---------------------------- -- Table structure for sys_notice @@ -883,7 +1019,7 @@ CREATE TABLE `sys_oper_log` ( INDEX `idx_sys_oper_log_bt`(`business_type` ASC) USING BTREE, INDEX `idx_sys_oper_log_s`(`status` ASC) USING BTREE, INDEX `idx_sys_oper_log_ot`(`oper_time` ASC) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 267 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '操作日志记录' ROW_FORMAT = Dynamic; +) ENGINE = InnoDB AUTO_INCREMENT = 281 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '操作日志记录' ROW_FORMAT = Dynamic; -- ---------------------------- -- Records of sys_oper_log