xins
/
HwMes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.6.1

Browse Source 
WMS:仓库增加入库要求、出库要求、退库要求和自动标识字段，并完成新增、修改和查询的修改
master
xins 1 year ago
parent 55baf9523a
commit 8e3cd2d2da
18 changed files with 1259 additions and 326 deletions
Show Stats Download Patch File Download Diff File

21
hw-modules/hw-wms/src/main/java/com/hw/wms/controller/WmsMobileController.java
Unescape Escape View File

@ -68,6 +68,9 @@ public class WmsMobileController extends BaseController {
@Autowired
private IWmsProductStockService wmsProductStockService;
@Autowired
private IWmsProductStockSaleorderService wmsProductStockSaleorderService;
@Resource
private RemoteMesService remoteMesService;
@ -254,7 +257,7 @@ public class WmsMobileController extends BaseController {
/**
* 根据仓库ID获取成品库存信息
* 根据仓库ID获取成品库存信息（目前就是根据半成品仓库ID获取库存信息，然后根据库存选择对应的成品和数量进行转到成品库）
*/
// @RequiresPermissions("wms:rawoutstock:query")
@GetMapping(value = "/getProductStocksByWarehouseId")
@ -316,17 +319,17 @@ public class WmsMobileController extends BaseController {
*/
// @RequiresPermissions("wms:rawoutstock:query")
@GetMapping(value = "/getProductStocksBySalesorderCode")
public TableDataInfo getProductStocksBySalesorderCode(WmsProductStock queryProductStock) {
public TableDataInfo getProductStocksBySalesorderCode(WmsProductStockSaleorder queryProductStockSaleorder) {
startPage();
// WmsProductStock queryProductStock = new WmsProductStock();
// queryProductStock.setSaleorderCode(request.getParameter("salesorderCode"));
// queryProductStock.setStockType(WmsConstants.PRODUCT_STOCK_STOCK_TYPE_PRODUCT);
List list = wmsProductStockService.selectWmsProductStocksBySaleorder(queryProductStock);
List list = wmsProductStockSaleorderService.selectWmsProductStockSaleordersBySaleorder(queryProductStockSaleorder);
return getDataTable(list);
}
/**
* 成品出库申请（包括人工合agv的出库申请）
* 成品出库申请（包括人工和agv的出库申请）
*/
@Log(title = "成品出库记录", businessType = BusinessType.INSERT)
@PostMapping(("/applyProductOutstock"))
@ -355,17 +358,17 @@ public class WmsMobileController extends BaseController {
// @RequiresPermissions("wms:rawoutstock:query")
@GetMapping(value = "/getProductOutStockWithDetails")
public AjaxResult getProductOutStockWithDetails(WmsProductOutstock queryProductOutstock) {
AjaxResult ajax = AjaxResult.success();
WmsProductOutstock productOutstock = wmsProductOutstockService.
selectWmsProductOutstockJoinByOutstockId(queryProductOutstock.getProductOutstockId());
startPage();
WmsProductOutstockDetail queryProductOutstockDetail = new WmsProductOutstockDetail();
queryProductOutstockDetail.setProductOutstockId(queryProductOutstock.getProductOutstockId());
List productOutstockDetails = wmsProductOutstockDetailService.selectWmsProductOutstockDetailList(queryProductOutstockDetail);
ajax.put("productOutstock", productOutstock);
ajax.put("productOutstockDetails", productOutstockDetails);
return ajax;
productOutstock.setWmsProductOutstockDetailList(productOutstockDetails);
// ajax.put("productOutstock", productOutstock);
// ajax.put("productOutstockDetails", productOutstockDetails);
return success(productOutstock);
}
/**

105
hw-modules/hw-wms/src/main/java/com/hw/wms/controller/WmsProductStockSaleorderController.java
Unescape Escape View File

@ -0,0 +1,105 @@
package com.hw.wms.controller;
import java.util.List;
import java.io.IOException;
import javax.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.hw.common.log.annotation.Log;
import com.hw.common.log.enums.BusinessType;
import com.hw.common.security.annotation.RequiresPermissions;
import com.hw.wms.domain.WmsProductStockSaleorder;
import com.hw.wms.service.IWmsProductStockSaleorderService;
import com.hw.common.core.web.controller.BaseController;
import com.hw.common.core.web.domain.AjaxResult;
import com.hw.common.core.utils.poi.ExcelUtil;
import com.hw.common.core.web.page.TableDataInfo;
/**
* 成品订单库存记录Controller
*
* @author xins
* @date 2024-02-22
*/
@RestController
@RequestMapping("/productstocksaleorder")
public class WmsProductStockSaleorderController extends BaseController
{
@Autowired
private IWmsProductStockSaleorderService wmsProductStockSaleorderService;
/**
* 查询成品订单库存记录列表
*/
@RequiresPermissions("wms:productstocksaleorder:list")
@GetMapping("/list")
public TableDataInfo list(WmsProductStockSaleorder wmsProductStockSaleorder)
{
startPage();
List<WmsProductStockSaleorder> list = wmsProductStockSaleorderService.selectWmsProductStockSaleorderList(wmsProductStockSaleorder);
return getDataTable(list);
}
/**
* 导出成品订单库存记录列表
*/
@RequiresPermissions("wms:productstocksaleorder:export")
@Log(title = "成品订单库存记录", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, WmsProductStockSaleorder wmsProductStockSaleorder)
{
List<WmsProductStockSaleorder> list = wmsProductStockSaleorderService.selectWmsProductStockSaleorderList(wmsProductStockSaleorder);
ExcelUtil<WmsProductStockSaleorder> util = new ExcelUtil<WmsProductStockSaleorder>(WmsProductStockSaleorder.class);
util.exportExcel(response, list, "成品订单库存记录数据");
}
/**
* 获取成品订单库存记录详细信息
*/
@RequiresPermissions("wms:productstocksaleorder:query")
@GetMapping(value = "/{productStockSaleorderId}")
public AjaxResult getInfo(@PathVariable("productStockSaleorderId") Long productStockSaleorderId)
{
return success(wmsProductStockSaleorderService.selectWmsProductStockSaleorderByProductStockSaleorderId(productStockSaleorderId));
}
/**
* 新增成品订单库存记录
*/
@RequiresPermissions("wms:productstocksaleorder:add")
@Log(title = "成品订单库存记录", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody WmsProductStockSaleorder wmsProductStockSaleorder)
{
return toAjax(wmsProductStockSaleorderService.insertWmsProductStockSaleorder(wmsProductStockSaleorder));
}
/**
* 修改成品订单库存记录
*/
@RequiresPermissions("wms:productstocksaleorder:edit")
@Log(title = "成品订单库存记录", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody WmsProductStockSaleorder wmsProductStockSaleorder)
{
return toAjax(wmsProductStockSaleorderService.updateWmsProductStockSaleorder(wmsProductStockSaleorder));
}
/**
* 删除成品订单库存记录
*/
@RequiresPermissions("wms:productstocksaleorder:remove")
@Log(title = "成品订单库存记录", businessType = BusinessType.DELETE)
@DeleteMapping("/{productStockSaleorderIds}")
public AjaxResult remove(@PathVariable Long[] productStockSaleorderIds)
{
return toAjax(wmsProductStockSaleorderService.deleteWmsProductStockSaleorderByProductStockSaleorderIds(productStockSaleorderIds));
}
}

95
hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsBaseLocation.java
Unescape Escape View File

@ -24,6 +24,9 @@ public class WmsBaseLocation extends BaseEntity
private String warehouseName;
/** 库位编码 */
private String agvPositionCode;
@Excel(name = "库位编码")
private String locationCode;
@ -94,22 +97,6 @@ public class WmsBaseLocation extends BaseEntity
@Excel(name = "是否报废库位 1:正常 0：报废")
private String locationScrapType;
/** 库位属性 */
@Excel(name = "库位属性")
private String locationAttr;
/** 周转需求 */
@Excel(name = "周转需求")
private String turnDemand;
/** 校验码 */
@Excel(name = "校验码")
private String checkCode;
/** 工作区 */
@Excel(name = "工作区")
private String workArea;
/** 体积限制 */
@Excel(name = "体积限制")
private BigDecimal volumeLimit;
@ -118,14 +105,6 @@ public class WmsBaseLocation extends BaseEntity
@Excel(name = "重量限制")
private BigDecimal weightLimit;
/** 箱数限制 */
@Excel(name = "箱数限制")
private Long boxLimit;
/** 托盘限制 */
@Excel(name = "托盘限制")
private Long palletLimit;
/** 长度 */
@Excel(name = "长度")
private BigDecimal length;
@ -185,6 +164,14 @@ public class WmsBaseLocation extends BaseEntity
this.warehouseName = warehouseName;
}
public String getAgvPositionCode() {
return agvPositionCode;
}
public void setAgvPositionCode(String agvPositionCode) {
this.agvPositionCode = agvPositionCode;
}
public void setLocationCode(String locationCode)
{
this.locationCode = locationCode;
@ -347,42 +334,6 @@ public class WmsBaseLocation extends BaseEntity
{
return locationScrapType;
}
public void setLocationAttr(String locationAttr)
{
this.locationAttr = locationAttr;
}
public String getLocationAttr()
{
return locationAttr;
}
public void setTurnDemand(String turnDemand)
{
this.turnDemand = turnDemand;
}
public String getTurnDemand()
{
return turnDemand;
}
public void setCheckCode(String checkCode)
{
this.checkCode = checkCode;
}
public String getCheckCode()
{
return checkCode;
}
public void setWorkArea(String workArea)
{
this.workArea = workArea;
}
public String getWorkArea()
{
return workArea;
}
public void setVolumeLimit(BigDecimal volumeLimit)
{
this.volumeLimit = volumeLimit;
@ -401,24 +352,6 @@ public class WmsBaseLocation extends BaseEntity
{
return weightLimit;
}
public void setBoxLimit(Long boxLimit)
{
this.boxLimit = boxLimit;
}
public Long getBoxLimit()
{
return boxLimit;
}
public void setPalletLimit(Long palletLimit)
{
this.palletLimit = palletLimit;
}
public Long getPalletLimit()
{
return palletLimit;
}
public void setLength(BigDecimal length)
{
this.length = length;
@ -520,14 +453,8 @@ public class WmsBaseLocation extends BaseEntity
.append("pickFlag", getPickFlag())
.append("isOpenKnFlag", getIsOpenKnFlag())
.append("locationScrapType", getLocationScrapType())
.append("locationAttr", getLocationAttr())
.append("turnDemand", getTurnDemand())
.append("checkCode", getCheckCode())
.append("workArea", getWorkArea())
.append("volumeLimit", getVolumeLimit())
.append("weightLimit", getWeightLimit())
.append("boxLimit", getBoxLimit())
.append("palletLimit", getPalletLimit())
.append("length", getLength())
.append("width", getWidth())
.append("height", getHeight())

357
hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsBaseWarehouse.java
Unescape Escape View File

@ -13,154 +13,212 @@ import java.util.List;
* @author xins
* @date 2024-01-09
*/
public class WmsBaseWarehouse extends BaseEntity
{
public class WmsBaseWarehouse extends BaseEntity {
private static final long serialVersionUID = 1L;
/** 仓库ID */
/**
* 仓库ID
*/
private Long warehouseId;
/** 存放类型(1原材料, 2半成品,3成品) */
/**
* 存放类型(1原材料, 2半成品,3成品)
*/
@Excel(name = "存放类型(1原材料, 2半成品,3成品)")
private String warehouseInstockType;
/** 仓库类型 0:普通仓库 1:背负agv仓库 2料箱agv仓库;背负agv仓库和料箱agv仓库审核标识为否 */
/**
* 仓库类型 0:普通仓库 1:背负agv仓库 2料箱agv仓库;背负agv仓库和料箱agv仓库审核标识为否
*/
@Excel(name = "仓库类型 1:普通仓库 2:背负agv仓库 3料箱agv仓库;背负agv仓库和料箱agv仓库审核标识为否")
private String warehouseType;
/** 仓库编码 */
/**
* 仓库编码
*/
@Excel(name = "仓库编码")
private String warehouseCode;
/** 仓库名称 */
/**
* 仓库名称
*/
@Excel(name = "仓库名称")
private String warehouseName;
/** 仓库类别(关联wms_base_category的category_id) */
/**
* 仓库类别(关联wms_base_category的category_id)
*/
private Long warehouseCategoryId;
/** 仓库类别名称 */
/**
* 仓库类别名称
*/
@Excel(name = "仓库类别")
private String warehouseCategoryName;
/** 楼层 */
/**
* 楼层
*/
@Excel(name = "楼层")
private Long warehouseFloor;
/** 管辖部门(关联sys_deptt的dept_id) */
/**
* 管辖部门(关联sys_deptt的dept_id)
*/
@Excel(name = "管辖部门(关联sys_deptt的dept_id)")
private Long deptId;
/** 多排库类型(1单排库,2双排库) */
/**
* 多排库类型(1单排库,2双排库)
*/
@Excel(name = "多排库类型(1单排库,2双排库)")
private String multiRowType;
/** 多边库类型(1单面库，2双面库);料箱agv是两面的，叉车agv在两面库的中间进行输送，尽量一次让叉车输送同一面的额任务 */
/**
* 多边库类型(1单面库，2双面库);料箱agv是两面的，叉车agv在两面库的中间进行输送，尽量一次让叉车输送同一面的额任务
*/
@Excel(name = "多边库类型(1单面库，2双面库);料箱agv是两面的，叉车agv在两面库的中间进行输送，尽量一次让叉车输送同一面的额任务")
private String multiSideType;
/** 允许混放批次(1是,0否) */
/**
* 允许混放批次(1是,0否)
*/
@Excel(name = "允许混放批次(1是,0否)")
private String batchMix;
/** 允许混放产品 1是 0否;预留，允许混放不同的产品 */
/**
* 允许混放产品 1是 0否;预留，允许混放不同的产品
*/
@Excel(name = "允许混放产品 1是 0否;预留，允许混放不同的产品")
private String productMix;
/** 料箱标识(0否,1是) */
/**
* 料箱标识(0否,1是)
*/
@Excel(name = "料箱标识(0否,1是)")
private String workbinFlag;
/** 位置 */
/**
* 位置
*/
@Excel(name = "位置")
private String warehouseLocation;
/** 激活标记 1是 0否 */
/**
* 激活标记 1是 0否
*/
@Excel(name = "激活标记 1是 0否")
private String activeFlag;
/** 审核标识 （1是，0否） */
@Excel(name = "审核标识 ", readConverterExp = "1=是，0否")
private String auditFlag;
/** 返库标识(1是，0否) */
/**
* 入库要求 （0申请入库，1申请审核入库，2直接入库）
*/
@Excel(name = "入库要求 ", readConverterExp = "0=申请入库，2直接入库")
private String inRequirement;
/**
* 出库要求 （0申请出库，1申请审核出库，2直接出库）
*/
@Excel(name = "出库要求 ", readConverterExp = "0=申请出库，1申请审核出库，2直接出库")
private String outRequirement;
/**
* 退库要求（0申请退库，1申请审核退库）
*/
@Excel(name = "退库要求", readConverterExp = "0=申请退库，1申请审核退库")
private String returnRequirement;
/**
* 自动标识(0全人工，1全自动，2入库自动，3出库自动)
*/
@Excel(name = "自动标识(0全人工，1全自动，2入库自动，3出库自动)")
private String autoFlag;
/**
* 返库标识(1是，0否)
*/
@Excel(name = "返库标识(1是，0否)")
private String returnFlag;
/** 删除标志 1删除 0显示 */
/**
* 删除标志 1删除 0显示
*/
private String delFlag;
/** 工厂ID */
/**
* 工厂ID
*/
@Excel(name = "工厂ID")
private Long factoryId;
/** 数据源 */
/**
* 数据源
*/
@Excel(name = "数据源")
private String dataSource;
/** DB用户 */
/**
* DB用户
*/
@Excel(name = "DB用户")
private String schame;
/** 是否按照线体入库 0否 1是 */
/**
* 是否按照线体入库 0否 1是
*/
@Excel(name = "是否按照线体入库 0否 1是")
private String lineFlag;
/** 库位信息 */
/**
* 库位信息
*/
private List<WmsBaseLocation> wmsBaseLocationList;
public void setWarehouseId(Long warehouseId)
{
public void setWarehouseId(Long warehouseId) {
this.warehouseId = warehouseId;
}
public Long getWarehouseId()
{
public Long getWarehouseId() {
return warehouseId;
}
public void setWarehouseInstockType(String warehouseInstockType)
{
public void setWarehouseInstockType(String warehouseInstockType) {
this.warehouseInstockType = warehouseInstockType;
}
public String getWarehouseInstockType()
{
public String getWarehouseInstockType() {
return warehouseInstockType;
}
public void setWarehouseType(String warehouseType)
{
public void setWarehouseType(String warehouseType) {
this.warehouseType = warehouseType;
}
public String getWarehouseType()
{
public String getWarehouseType() {
return warehouseType;
}
public void setWarehouseCode(String warehouseCode)
{
public void setWarehouseCode(String warehouseCode) {
this.warehouseCode = warehouseCode;
}
public String getWarehouseCode()
{
public String getWarehouseCode() {
return warehouseCode;
}
public void setWarehouseName(String warehouseName)
{
public void setWarehouseName(String warehouseName) {
this.warehouseName = warehouseName;
}
public String getWarehouseName()
{
public String getWarehouseName() {
return warehouseName;
}
public void setWarehouseCategoryId(Long warehouseCategoryId)
{
public void setWarehouseCategoryId(Long warehouseCategoryId) {
this.warehouseCategoryId = warehouseCategoryId;
}
public Long getWarehouseCategoryId()
{
public Long getWarehouseCategoryId() {
return warehouseCategoryId;
}
@ -172,13 +230,11 @@ public class WmsBaseWarehouse extends BaseEntity
this.warehouseCategoryName = warehouseCategoryName;
}
public void setWarehouseFloor(Long warehouseFloor)
{
public void setWarehouseFloor(Long warehouseFloor) {
this.warehouseFloor = warehouseFloor;
}
public Long getWarehouseFloor()
{
public Long getWarehouseFloor() {
return warehouseFloor;
}
@ -190,130 +246,139 @@ public class WmsBaseWarehouse extends BaseEntity
this.deptId = deptId;
}
public void setMultiRowType(String multiRowType)
{
public void setMultiRowType(String multiRowType) {
this.multiRowType = multiRowType;
}
public String getMultiRowType()
{
public String getMultiRowType() {
return multiRowType;
}
public void setMultiSideType(String multiSideType)
{
public void setMultiSideType(String multiSideType) {
this.multiSideType = multiSideType;
}
public String getMultiSideType()
{
public String getMultiSideType() {
return multiSideType;
}
public void setBatchMix(String batchMix)
{
public void setBatchMix(String batchMix) {
this.batchMix = batchMix;
}
public String getBatchMix()
{
public String getBatchMix() {
return batchMix;
}
public void setProductMix(String productMix)
{
public void setProductMix(String productMix) {
this.productMix = productMix;
}
public String getProductMix()
{
public String getProductMix() {
return productMix;
}
public void setWorkbinFlag(String workbinFlag)
{
public void setWorkbinFlag(String workbinFlag) {
this.workbinFlag = workbinFlag;
}
public String getWorkbinFlag()
{
public String getWorkbinFlag() {
return workbinFlag;
}
public void setWarehouseLocation(String warehouseLocation)
{
public void setWarehouseLocation(String warehouseLocation) {
this.warehouseLocation = warehouseLocation;
}
public String getWarehouseLocation()
{
public String getWarehouseLocation() {
return warehouseLocation;
}
public void setActiveFlag(String activeFlag)
{
public void setActiveFlag(String activeFlag) {
this.activeFlag = activeFlag;
}
public String getActiveFlag()
{
public String getActiveFlag() {
return activeFlag;
}
public void setAuditFlag(String auditFlag)
{
this.auditFlag = auditFlag;
public String getInRequirement() {
return inRequirement;
}
public void setInRequirement(String inRequirement) {
this.inRequirement = inRequirement;
}
public String getAuditFlag()
{
return auditFlag;
public String getOutRequirement() {
return outRequirement;
}
public void setReturnFlag(String returnFlag)
{
public void setOutRequirement(String outRequirement) {
this.outRequirement = outRequirement;
}
public String getReturnRequirement() {
return returnRequirement;
}
public void setReturnRequirement(String returnRequirement) {
this.returnRequirement = returnRequirement;
}
public String getAutoFlag() {
return autoFlag;
}
public void setAutoFlag(String autoFlag) {
this.autoFlag = autoFlag;
}
public void setReturnFlag(String returnFlag) {
this.returnFlag = returnFlag;
}
public String getReturnFlag()
{
public String getReturnFlag() {
return returnFlag;
}
public void setDelFlag(String delFlag)
{
public void setDelFlag(String delFlag) {
this.delFlag = delFlag;
}
public String getDelFlag()
{
public String getDelFlag() {
return delFlag;
}
public void setFactoryId(Long factoryId)
{
public void setFactoryId(Long factoryId) {
this.factoryId = factoryId;
}
public Long getFactoryId()
{
public Long getFactoryId() {
return factoryId;
}
public void setDataSource(String dataSource)
{
public void setDataSource(String dataSource) {
this.dataSource = dataSource;
}
public String getDataSource()
{
public String getDataSource() {
return dataSource;
}
public void setSchame(String schame)
{
public void setSchame(String schame) {
this.schame = schame;
}
public String getSchame()
{
public String getSchame() {
return schame;
}
public void setLineFlag(String lineFlag)
{
public void setLineFlag(String lineFlag) {
this.lineFlag = lineFlag;
}
public String getLineFlag()
{
public String getLineFlag() {
return lineFlag;
}
@ -327,34 +392,38 @@ public class WmsBaseWarehouse extends BaseEntity
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("warehouseId", getWarehouseId())
.append("warehouseInstockType", getWarehouseInstockType())
.append("warehouseType", getWarehouseType())
.append("warehouseCode", getWarehouseCode())
.append("warehouseName", getWarehouseName())
.append("warehouseCategoryId", getWarehouseCategoryId())
.append("warehouseFloor", getWarehouseFloor())
.append("deptId", getDeptId())
.append("multiRowType", getMultiRowType())
.append("multiSideType", getMultiSideType())
.append("batchMix", getBatchMix())
.append("productMix", getProductMix())
.append("workbinFlag", getWorkbinFlag())
.append("warehouseLocation", getWarehouseLocation())
.append("activeFlag", getActiveFlag())
.append("auditFlag", getAuditFlag())
.append("returnFlag", getReturnFlag())
.append("remark", getRemark())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.append("delFlag", getDelFlag())
.append("factoryId", getFactoryId())
.append("dataSource", getDataSource())
.append("schame", getSchame())
.append("lineFlag", getLineFlag())
.toString();
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("warehouseId", getWarehouseId())
.append("warehouseInstockType", getWarehouseInstockType())
.append("warehouseType", getWarehouseType())
.append("warehouseCode", getWarehouseCode())
.append("warehouseName", getWarehouseName())
.append("warehouseCategoryId", getWarehouseCategoryId())
.append("warehouseFloor", getWarehouseFloor())
.append("deptId", getDeptId())
.append("multiRowType", getMultiRowType())
.append("multiSideType", getMultiSideType())
.append("batchMix", getBatchMix())
.append("productMix", getProductMix())
.append("workbinFlag", getWorkbinFlag())
.append("warehouseLocation", getWarehouseLocation())
.append("activeFlag", getActiveFlag())
.append("inRequirement", getInRequirement())
.append("outRequirement", getOutRequirement())
.append("returnRequirement", getReturnRequirement())
.append("autoFlag", getAutoFlag())
.append("returnFlag", getReturnFlag())
.append("remark", getRemark())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.append("delFlag", getDelFlag())
.append("factoryId", getFactoryId())
.append("dataSource", getDataSource())
.append("schame", getSchame())
.append("lineFlag", getLineFlag())
.append("wmsBaseLocationList", getWmsBaseLocationList())
.toString();
}
}

13
hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsProductOutstockDetail.java
Unescape Escape View File

@ -53,6 +53,10 @@ public class WmsProductOutstockDetail extends BaseEntity
@Excel(name = "出库数量")
private BigDecimal outstockAmount;
/** 确认数量 */
@Excel(name = "确认数量")
private BigDecimal confirmAmount;
/** 执行状态(0待执行,1执行中,2执行完成) */
@Excel(name = "执行状态(0待执行,1执行中,2执行完成)")
private String executeStatus;
@ -157,6 +161,15 @@ public class WmsProductOutstockDetail extends BaseEntity
{
return outstockAmount;
}
public BigDecimal getConfirmAmount() {
return confirmAmount;
}
public void setConfirmAmount(BigDecimal confirmAmount) {
this.confirmAmount = confirmAmount;
}
public void setExecuteStatus(String executeStatus)
{
this.executeStatus = executeStatus;

298
hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsProductStockSaleorder.java
Unescape Escape View File

@ -0,0 +1,298 @@
package com.hw.wms.domain;
import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.hw.common.core.annotation.Excel;
import com.hw.common.core.web.domain.BaseEntity;
/**
* 成品订单库存记录对象 wms_product_stock_saleorder
*
* @author xins
* @date 2024-02-22
*/
public class WmsProductStockSaleorder extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 成品库存ID */
private Long productStockSaleorderId;
/** 仓库ID */
@Excel(name = "仓库ID")
private Long warehouseId;
/** 仓库楼层 */
@Excel(name = "仓库楼层")
private Long warehouseFloor;
/** 库存类型(2半成品，3成品) */
@Excel(name = "库存类型(2半成品，3成品)")
private String stockType;
/** 产品ID，关联物料信息的物料ID */
@Excel(name = "产品ID，关联物料信息的物料ID")
private Long productId;
/** 销售订单ID，关联销售订单主键 */
@Excel(name = "销售订单ID，关联销售订单主键")
private Long saleOrderId;
/** 销售订单编号 */
@Excel(name = "销售订单编号")
private String saleorderCode;
/** 总数量;此数量记录此订单生产的总数量，只能加，不能减 */
@Excel(name = "总数量;此数量记录此订单生产的总数量，只能加，不能减")
private BigDecimal totalAmount;
/** 占用数量 */
@Excel(name = "占用数量")
private BigDecimal occupyAmount;
/** 冻结数量 */
@Excel(name = "冻结数量")
private BigDecimal frozenAmount;
/** 已申请数量 */
@Excel(name = "已申请数量")
private BigDecimal applyAmount;
/** 已出库数量（库管或agv出库的数量） */
@Excel(name = "已出库数量", readConverterExp = "库=管或agv出库的数量")
private BigDecimal outstockAmount;
/** 确认数量（在一楼最终扫码确认出库的数量） */
@Excel(name = "确认数量", readConverterExp = "在=一楼最终扫码确认出库的数量")
private BigDecimal confirmAmount;
/** 创建时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date createDate;
/** 最后更新时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "最后更新时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date updateDate;
/** 有效标记 */
@Excel(name = "有效标记")
private String activeFlag;
private String materialCode;
private String materialName;
/**
* 销售订单销售数量
*/
private BigDecimal orderAmount;
private String warehouseName;
public void setProductStockSaleorderId(Long productStockSaleorderId)
{
this.productStockSaleorderId = productStockSaleorderId;
}
public Long getProductStockSaleorderId()
{
return productStockSaleorderId;
}
public void setWarehouseId(Long warehouseId)
{
this.warehouseId = warehouseId;
}
public Long getWarehouseId()
{
return warehouseId;
}
public void setWarehouseFloor(Long warehouseFloor)
{
this.warehouseFloor = warehouseFloor;
}
public Long getWarehouseFloor()
{
return warehouseFloor;
}
public void setStockType(String stockType)
{
this.stockType = stockType;
}
public String getStockType()
{
return stockType;
}
public void setProductId(Long productId)
{
this.productId = productId;
}
public Long getProductId()
{
return productId;
}
public void setSaleOrderId(Long saleOrderId)
{
this.saleOrderId = saleOrderId;
}
public Long getSaleOrderId()
{
return saleOrderId;
}
public void setSaleorderCode(String saleorderCode)
{
this.saleorderCode = saleorderCode;
}
public String getSaleorderCode()
{
return saleorderCode;
}
public void setTotalAmount(BigDecimal totalAmount)
{
this.totalAmount = totalAmount;
}
public BigDecimal getTotalAmount()
{
return totalAmount;
}
public void setOccupyAmount(BigDecimal occupyAmount)
{
this.occupyAmount = occupyAmount;
}
public BigDecimal getOccupyAmount()
{
return occupyAmount;
}
public void setFrozenAmount(BigDecimal frozenAmount)
{
this.frozenAmount = frozenAmount;
}
public BigDecimal getFrozenAmount()
{
return frozenAmount;
}
public void setApplyAmount(BigDecimal applyAmount)
{
this.applyAmount = applyAmount;
}
public BigDecimal getApplyAmount()
{
return applyAmount;
}
public void setOutstockAmount(BigDecimal outstockAmount)
{
this.outstockAmount = outstockAmount;
}
public BigDecimal getOutstockAmount()
{
return outstockAmount;
}
public void setConfirmAmount(BigDecimal confirmAmount)
{
this.confirmAmount = confirmAmount;
}
public BigDecimal getConfirmAmount()
{
return confirmAmount;
}
public void setCreateDate(Date createDate)
{
this.createDate = createDate;
}
public Date getCreateDate()
{
return createDate;
}
public void setUpdateDate(Date updateDate)
{
this.updateDate = updateDate;
}
public Date getUpdateDate()
{
return updateDate;
}
public void setActiveFlag(String activeFlag)
{
this.activeFlag = activeFlag;
}
public String getActiveFlag()
{
return activeFlag;
}
public String getMaterialCode() {
return materialCode;
}
public void setMaterialCode(String materialCode) {
this.materialCode = materialCode;
}
public String getMaterialName() {
return materialName;
}
public void setMaterialName(String materialName) {
this.materialName = materialName;
}
public BigDecimal getOrderAmount() {
return orderAmount;
}
public void setOrderAmount(BigDecimal orderAmount) {
this.orderAmount = orderAmount;
}
public String getWarehouseName() {
return warehouseName;
}
public void setWarehouseName(String warehouseName) {
this.warehouseName = warehouseName;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("productStockSaleorderId", getProductStockSaleorderId())
.append("warehouseId", getWarehouseId())
.append("warehouseFloor", getWarehouseFloor())
.append("stockType", getStockType())
.append("productId", getProductId())
.append("saleOrderId", getSaleOrderId())
.append("saleorderCode", getSaleorderCode())
.append("totalAmount", getTotalAmount())
.append("occupyAmount", getOccupyAmount())
.append("frozenAmount", getFrozenAmount())
.append("applyAmount", getApplyAmount())
.append("outstockAmount", getOutstockAmount())
.append("confirmAmount", getConfirmAmount())
.append("createBy", getCreateBy())
.append("createDate", getCreateDate())
.append("updateBy", getUpdateBy())
.append("updateDate", getUpdateDate())
.append("activeFlag", getActiveFlag())
.toString();
}
}

77
hw-modules/hw-wms/src/main/java/com/hw/wms/mapper/WmsProductStockSaleorderMapper.java
Unescape Escape View File

@ -0,0 +1,77 @@
package com.hw.wms.mapper;
import java.util.List;
import com.hw.wms.domain.WmsProductStockSaleorder;
/**
* 成品订单库存记录Mapper接口
*
* @author xins
* @date 2024-02-22
*/
public interface WmsProductStockSaleorderMapper
{
/**
* 查询成品订单库存记录
*
* @param productStockSaleorderId 成品订单库存记录主键
* @return 成品订单库存记录
*/
public WmsProductStockSaleorder selectWmsProductStockSaleorderByProductStockSaleorderId(Long productStockSaleorderId);
/**
* 查询成品订单库存记录列表
*
* @param wmsProductStockSaleorder 成品订单库存记录
* @return 成品订单库存记录集合
*/
public List<WmsProductStockSaleorder> selectWmsProductStockSaleorderList(WmsProductStockSaleorder wmsProductStockSaleorder);
/**
* 新增成品订单库存记录
*
* @param wmsProductStockSaleorder 成品订单库存记录
* @return 结果
*/
public int insertWmsProductStockSaleorder(WmsProductStockSaleorder wmsProductStockSaleorder);
/**
* 修改成品订单库存记录
*
* @param wmsProductStockSaleorder 成品订单库存记录
* @return 结果
*/
public int updateWmsProductStockSaleorder(WmsProductStockSaleorder wmsProductStockSaleorder);
/**
* 删除成品订单库存记录
*
* @param productStockSaleorderId 成品订单库存记录主键
* @return 结果
*/
public int deleteWmsProductStockSaleorderByProductStockSaleorderId(Long productStockSaleorderId);
/**
* 批量删除成品订单库存记录
*
* @param productStockSaleorderIds 需要删除的数据主键集合
* @return 结果
*/
public int deleteWmsProductStockSaleorderByProductStockSaleorderIds(Long[] productStockSaleorderIds);
/**
* 查询成品订单库存记录列表,Join material,saleorder
*
* @param wmsProductStockSaleorder 成品订单库存记录
* @return 成品订单库存记录集合
*/
public List<WmsProductStockSaleorder> selectWmsProductStockSaleorderJoinList(WmsProductStockSaleorder wmsProductStockSaleorder);
}

73
hw-modules/hw-wms/src/main/java/com/hw/wms/service/IWmsProductStockSaleorderService.java
Unescape Escape View File

@ -0,0 +1,73 @@
package com.hw.wms.service;
import java.util.List;
import com.hw.wms.domain.WmsProductStockSaleorder;
/**
* 成品订单库存记录Service接口
*
* @author xins
* @date 2024-02-22
*/
public interface IWmsProductStockSaleorderService
{
/**
* 查询成品订单库存记录
*
* @param productStockSaleorderId 成品订单库存记录主键
* @return 成品订单库存记录
*/
public WmsProductStockSaleorder selectWmsProductStockSaleorderByProductStockSaleorderId(Long productStockSaleorderId);
/**
* 查询成品订单库存记录列表
*
* @param wmsProductStockSaleorder 成品订单库存记录
* @return 成品订单库存记录集合
*/
public List<WmsProductStockSaleorder> selectWmsProductStockSaleorderList(WmsProductStockSaleorder wmsProductStockSaleorder);
/**
* 新增成品订单库存记录
*
* @param wmsProductStockSaleorder 成品订单库存记录
* @return 结果
*/
public int insertWmsProductStockSaleorder(WmsProductStockSaleorder wmsProductStockSaleorder);
/**
* 修改成品订单库存记录
*
* @param wmsProductStockSaleorder 成品订单库存记录
* @return 结果
*/
public int updateWmsProductStockSaleorder(WmsProductStockSaleorder wmsProductStockSaleorder);
/**
* 批量删除成品订单库存记录
*
* @param productStockSaleorderIds 需要删除的成品订单库存记录主键集合
* @return 结果
*/
public int deleteWmsProductStockSaleorderByProductStockSaleorderIds(Long[] productStockSaleorderIds);
/**
* 删除成品订单库存记录信息
*
* @param productStockSaleorderId 成品订单库存记录主键
* @return 结果
*/
public int deleteWmsProductStockSaleorderByProductStockSaleorderId(Long productStockSaleorderId);
/**
* 根据销售订单查询成品库存列表Join material,warehouse
*
* @param wmsProductStockSaleorder 成品销售订单库存信息
* @return 成品销售订单库存信息
*/
public List<WmsProductStockSaleorder> selectWmsProductStockSaleordersBySaleorder(WmsProductStockSaleorder wmsProductStockSaleorder);
}

115
hw-modules/hw-wms/src/main/java/com/hw/wms/service/impl/WmsProductStockSaleorderServiceImpl.java
Unescape Escape View File

@ -0,0 +1,115 @@
package com.hw.wms.service.impl;
import java.util.List;
import com.hw.common.core.exception.ServiceException;
import com.hw.wms.domain.WmsProductStock;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.hw.wms.mapper.WmsProductStockSaleorderMapper;
import com.hw.wms.domain.WmsProductStockSaleorder;
import com.hw.wms.service.IWmsProductStockSaleorderService;
/**
* 成品订单库存记录Service业务层处理
*
* @author xins
* @date 2024-02-22
*/
@Service
public class WmsProductStockSaleorderServiceImpl implements IWmsProductStockSaleorderService
{
@Autowired
private WmsProductStockSaleorderMapper wmsProductStockSaleorderMapper;
/**
* 查询成品订单库存记录
*
* @param productStockSaleorderId 成品订单库存记录主键
* @return 成品订单库存记录
*/
@Override
public WmsProductStockSaleorder selectWmsProductStockSaleorderByProductStockSaleorderId(Long productStockSaleorderId)
{
return wmsProductStockSaleorderMapper.selectWmsProductStockSaleorderByProductStockSaleorderId(productStockSaleorderId);
}
/**
* 查询成品订单库存记录列表
*
* @param wmsProductStockSaleorder 成品订单库存记录
* @return 成品订单库存记录
*/
@Override
public List<WmsProductStockSaleorder> selectWmsProductStockSaleorderList(WmsProductStockSaleorder wmsProductStockSaleorder)
{
return wmsProductStockSaleorderMapper.selectWmsProductStockSaleorderList(wmsProductStockSaleorder);
}
/**
* 新增成品订单库存记录
*
* @param wmsProductStockSaleorder 成品订单库存记录
* @return 结果
*/
@Override
public int insertWmsProductStockSaleorder(WmsProductStockSaleorder wmsProductStockSaleorder)
{
return wmsProductStockSaleorderMapper.insertWmsProductStockSaleorder(wmsProductStockSaleorder);
}
/**
* 修改成品订单库存记录
*
* @param wmsProductStockSaleorder 成品订单库存记录
* @return 结果
*/
@Override
public int updateWmsProductStockSaleorder(WmsProductStockSaleorder wmsProductStockSaleorder)
{
return wmsProductStockSaleorderMapper.updateWmsProductStockSaleorder(wmsProductStockSaleorder);
}
/**
* 批量删除成品订单库存记录
*
* @param productStockSaleorderIds 需要删除的成品订单库存记录主键
* @return 结果
*/
@Override
public int deleteWmsProductStockSaleorderByProductStockSaleorderIds(Long[] productStockSaleorderIds)
{
return wmsProductStockSaleorderMapper.deleteWmsProductStockSaleorderByProductStockSaleorderIds(productStockSaleorderIds);
}
/**
* 删除成品订单库存记录信息
*
* @param productStockSaleorderId 成品订单库存记录主键
* @return 结果
*/
@Override
public int deleteWmsProductStockSaleorderByProductStockSaleorderId(Long productStockSaleorderId)
{
return wmsProductStockSaleorderMapper.deleteWmsProductStockSaleorderByProductStockSaleorderId(productStockSaleorderId);
}
/**
* 根据销售订单查询成品库存列表Join material,warehouse
*
* @param wmsProductStockSaleorder 成品销售订单库存信息
* @return 成品销售订单库存信息
*/
@Override
public List<WmsProductStockSaleorder> selectWmsProductStockSaleordersBySaleorder(WmsProductStockSaleorder wmsProductStockSaleorder) {
List<WmsProductStockSaleorder> list = wmsProductStockSaleorderMapper.selectWmsProductStockSaleorderJoinList(wmsProductStockSaleorder);
if (list == null || list.isEmpty()) {
throw new ServiceException("无此销售订单库存信息");
}
return list;
}
}

2
hw-modules/hw-wms/src/main/java/com/hw/wms/service/impl/WmsProductStockServiceImpl.java
Unescape Escape View File

@ -103,7 +103,7 @@ public class WmsProductStockServiceImpl implements IWmsProductStockService {
}
/**
* 根据销售订单查询成品库存列表Join material,warehouse,totalAmount>0
* 根据销售订单查询成品库存列表Join material,warehouse,totalAmount>0(暂时不用，废弃，改为从product_stock_saleorder获取)
*
* @param wmsProductStock 成品库存
* @return 成品库存

20
hw-modules/hw-wms/src/main/resources/bootstrap.yml
Unescape Escape View File

@ -16,14 +16,30 @@ spring:
# 服务注册地址
server-addr: 175.27.215.92:8848
namespace: jyhb-test
group: DEFAULT_GROUP
group: xins
config:
# 配置中心地址
server-addr: 175.27.215.92:8848
namespace: jyhb-test
group: DEFAULT_GROUP
group: xins
# 配置文件格式
file-extension: yml
# 共享配置
shared-configs:
- application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
# nacos:
# discovery:
# # 服务注册地址
# server-addr: 127.0.0.1:8848
# namespace: jyhb
# group: DEFAULT_GROUP
# config:
# # 配置中心地址
# server-addr: 127.0.0.1:8848
# namespace: jyhb
# group: DEFAULT_GROUP
# # 配置文件格式
# file-extension: yml
# # 共享配置
# shared-configs:
# - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}

44
hw-modules/hw-wms/src/main/resources/mapper/wms/WmsBaseLocationMapper.xml
Unescape Escape View File

@ -8,6 +8,7 @@
<result property="locationId" column="location_id" />
<result property="warehouseId" column="warehouse_id" />
<result property="warehouseName" column="warehouse_name" />
<result property="agvPositionCode" column="agv_position_code" />
<result property="locationCode" column="location_code" />
<result property="locRow" column="loc_row" />
<result property="layerNum" column="layer_num" />
@ -31,21 +32,15 @@
<result property="pickFlag" column="pick_flag" />
<result property="isOpenKnFlag" column="is_open_kn_flag" />
<result property="locationScrapType" column="location_scrap_type" />
<result property="locationAttr" column="location_attr" />
<result property="turnDemand" column="turn_demand" />
<result property="checkCode" column="check_code" />
<result property="workArea" column="work_area" />
<result property="volumeLimit" column="volume_limit" />
<result property="weightLimit" column="weight_limit" />
<result property="boxLimit" column="box_limit" />
<result property="palletLimit" column="pallet_limit" />
<result property="length" column="length" />
<result property="width" column="width" />
<result property="height" column="height" />
</resultMap>
<sql id="selectWmsBaseLocationVo">
select location_id, warehouse_id, location_code, loc_row, layer_num, loc_column, active_flag, manual_flag, qty_limit, instock_flag, outstock_flag, location_status, batch_mix, create_by, create_time, update_by, update_time, remark, del_flag, shelf_order, check_order, pick_order, pick_flag, is_open_kn_flag, location_scrap_type, location_attr, turn_demand, check_code, work_area, volume_limit, weight_limit, box_limit, pallet_limit, length, width, height from wms_base_location
select location_id, warehouse_id, location_code, loc_row, layer_num, loc_column, active_flag, manual_flag, qty_limit, instock_flag, outstock_flag, location_status, batch_mix, create_by, create_time, update_by, update_time, remark, del_flag, shelf_order, check_order, pick_order, pick_flag, is_open_kn_flag, location_scrap_type, volume_limit, weight_limit, length, width, height from wms_base_location
</sql>
<select id="selectWmsBaseLocationList" parameterType="WmsBaseLocation" resultMap="WmsBaseLocationResult">
@ -69,14 +64,8 @@
<if test="pickFlag != null and pickFlag != ''"> and pick_flag = #{pickFlag}</if>
<if test="isOpenKnFlag != null and isOpenKnFlag != ''"> and is_open_kn_flag = #{isOpenKnFlag}</if>
<if test="locationScrapType != null and locationScrapType != ''"> and location_scrap_type = #{locationScrapType}</if>
<if test="locationAttr != null and locationAttr != ''"> and location_attr = #{locationAttr}</if>
<if test="turnDemand != null and turnDemand != ''"> and turn_demand = #{turnDemand}</if>
<if test="checkCode != null and checkCode != ''"> and check_code = #{checkCode}</if>
<if test="workArea != null and workArea != ''"> and work_area = #{workArea}</if>
<if test="volumeLimit != null "> and volume_limit = #{volumeLimit}</if>
<if test="weightLimit != null "> and weight_limit = #{weightLimit}</if>
<if test="boxLimit != null "> and box_limit = #{boxLimit}</if>
<if test="palletLimit != null "> and pallet_limit = #{palletLimit}</if>
<if test="length != null "> and length = #{length}</if>
<if test="width != null "> and width = #{width}</if>
<if test="height != null "> and height = #{height}</if>
@ -92,6 +81,7 @@
insert into wms_base_location
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="warehouseId != null">warehouse_id,</if>
<if test="agvPositionCode != null and agvPositionCode != ''">agv_position_code,</if>
<if test="locationCode != null and locationCode != ''">location_code,</if>
<if test="locRow != null">loc_row,</if>
<if test="layerNum != null">layer_num,</if>
@ -115,20 +105,15 @@
<if test="pickFlag != null">pick_flag,</if>
<if test="isOpenKnFlag != null">is_open_kn_flag,</if>
<if test="locationScrapType != null">location_scrap_type,</if>
<if test="locationAttr != null">location_attr,</if>
<if test="turnDemand != null">turn_demand,</if>
<if test="checkCode != null">check_code,</if>
<if test="workArea != null">work_area,</if>
<if test="volumeLimit != null">volume_limit,</if>
<if test="weightLimit != null">weight_limit,</if>
<if test="boxLimit != null">box_limit,</if>
<if test="palletLimit != null">pallet_limit,</if>
<if test="length != null">length,</if>
<if test="width != null">width,</if>
<if test="height != null">height,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="warehouseId != null">#{warehouseId},</if>
<if test="agvPositionCode != null and agvPositionCode != ''">#{agvPositionCode},</if>
<if test="locationCode != null and locationCode != ''">#{locationCode},</if>
<if test="locRow != null">#{locRow},</if>
<if test="layerNum != null">#{layerNum},</if>
@ -152,14 +137,8 @@
<if test="pickFlag != null">#{pickFlag},</if>
<if test="isOpenKnFlag != null">#{isOpenKnFlag},</if>
<if test="locationScrapType != null">#{locationScrapType},</if>
<if test="locationAttr != null">#{locationAttr},</if>
<if test="turnDemand != null">#{turnDemand},</if>
<if test="checkCode != null">#{checkCode},</if>
<if test="workArea != null">#{workArea},</if>
<if test="volumeLimit != null">#{volumeLimit},</if>
<if test="weightLimit != null">#{weightLimit},</if>
<if test="boxLimit != null">#{boxLimit},</if>
<if test="palletLimit != null">#{palletLimit},</if>
<if test="length != null">#{length},</if>
<if test="width != null">#{width},</if>
<if test="height != null">#{height},</if>
@ -170,6 +149,7 @@
update wms_base_location
<trim prefix="SET" suffixOverrides=",">
<if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
<if test="agvPositionCode != null and agvPositionCode != ''">agv_position_code = #{agvPositionCode},</if>
<if test="locationCode != null and locationCode != ''">location_code = #{locationCode},</if>
<if test="locRow != null">loc_row = #{locRow},</if>
<if test="layerNum != null">layer_num = #{layerNum},</if>
@ -193,14 +173,8 @@
<if test="pickFlag != null">pick_flag = #{pickFlag},</if>
<if test="isOpenKnFlag != null">is_open_kn_flag = #{isOpenKnFlag},</if>
<if test="locationScrapType != null">location_scrap_type = #{locationScrapType},</if>
<if test="locationAttr != null">location_attr = #{locationAttr},</if>
<if test="turnDemand != null">turn_demand = #{turnDemand},</if>
<if test="checkCode != null">check_code = #{checkCode},</if>
<if test="workArea != null">work_area = #{workArea},</if>
<if test="volumeLimit != null">volume_limit = #{volumeLimit},</if>
<if test="weightLimit != null">weight_limit = #{weightLimit},</if>
<if test="boxLimit != null">box_limit = #{boxLimit},</if>
<if test="palletLimit != null">pallet_limit = #{palletLimit},</if>
<if test="length != null">length = #{length},</if>
<if test="width != null">width = #{width},</if>
<if test="height != null">height = #{height},</if>
@ -250,14 +224,8 @@
<if test="pickFlag != null and pickFlag != ''"> and pick_flag = #{pickFlag}</if>
<if test="isOpenKnFlag != null and isOpenKnFlag != ''"> and is_open_kn_flag = #{isOpenKnFlag}</if>
<if test="locationScrapType != null and locationScrapType != ''"> and location_scrap_type = #{locationScrapType}</if>
<if test="locationAttr != null and locationAttr != ''"> and location_attr = #{locationAttr}</if>
<if test="turnDemand != null and turnDemand != ''"> and turn_demand = #{turnDemand}</if>
<if test="checkCode != null and checkCode != ''"> and check_code = #{checkCode}</if>
<if test="workArea != null and workArea != ''"> and work_area = #{workArea}</if>
<if test="volumeLimit != null "> and volume_limit = #{volumeLimit}</if>
<if test="weightLimit != null "> and weight_limit = #{weightLimit}</if>
<if test="boxLimit != null "> and box_limit = #{boxLimit}</if>
<if test="palletLimit != null "> and pallet_limit = #{palletLimit}</if>
<if test="length != null "> and length = #{length}</if>
<if test="width != null "> and width = #{width}</if>
<if test="height != null "> and height = #{height}</if>
@ -269,7 +237,7 @@
<select id="selectWmsBaseLocationJoinList" parameterType="WmsBaseLocation" resultMap="WmsBaseLocationResult">
select wbl.location_id, wbl.warehouse_id, wbl.location_code, wbl.loc_row, wbl.layer_num, wbl.loc_column, wbl.active_flag, wbl.manual_flag,
select wbl.location_id, wbl.warehouse_id,wbl.agv_position_code, wbl.location_code, wbl.loc_row, wbl.layer_num, wbl.loc_column, wbl.active_flag, wbl.manual_flag,
wbl.qty_limit, wbl.instock_flag, wbl.outstock_flag, wbl.location_status, wbl.remark,wbw.warehouse_name
from wms_base_location wbl left join wms_base_warehouse wbw on wbl.warehouse_id = wbw.warehouse_id

55
hw-modules/hw-wms/src/main/resources/mapper/wms/WmsBaseWarehouseMapper.xml
Unescape Escape View File

@ -11,7 +11,6 @@
<result property="warehouseCode" column="warehouse_code" />
<result property="warehouseName" column="warehouse_name" />
<result property="warehouseCategoryId" column="warehouse_category_id" />
<result property="warehouseCategoryName" column="category_name" />
<result property="warehouseFloor" column="warehouse_floor" />
<result property="deptId" column="dept_id" />
<result property="multiRowType" column="multi_row_type" />
@ -21,7 +20,10 @@
<result property="workbinFlag" column="workbin_flag" />
<result property="warehouseLocation" column="warehouse_location" />
<result property="activeFlag" column="active_flag" />
<result property="auditFlag" column="audit_flag" />
<result property="inRequirement" column="in_requirement" />
<result property="outRequirement" column="out_requirement" />
<result property="returnRequirement" column="return_requirement" />
<result property="autoFlag" column="auto_flag" />
<result property="returnFlag" column="return_flag" />
<result property="remark" column="remark" />
<result property="createBy" column="create_by" />
@ -65,21 +67,15 @@
<result property="pickFlag" column="sub_pick_flag" />
<result property="isOpenKnFlag" column="sub_is_open_kn_flag" />
<result property="locationScrapType" column="sub_location_scrap_type" />
<result property="locationAttr" column="sub_location_attr" />
<result property="turnDemand" column="sub_turn_demand" />
<result property="checkCode" column="sub_check_code" />
<result property="workArea" column="sub_work_area" />
<result property="volumeLimit" column="sub_volume_limit" />
<result property="weightLimit" column="sub_weight_limit" />
<result property="boxLimit" column="sub_box_limit" />
<result property="palletLimit" column="sub_pallet_limit" />
<result property="length" column="sub_length" />
<result property="width" column="sub_width" />
<result property="height" column="sub_height" />
</resultMap>
<sql id="selectWmsBaseWarehouseVo">
select warehouse_id, warehouse_instock_type, warehouse_type, warehouse_code, warehouse_name, warehouse_category_id, warehouse_floor, dept_id, multi_row_type, multi_side_type, batch_mix, product_mix, workbin_flag, warehouse_location, active_flag, audit_flag, return_flag, remark, create_by, create_time, update_by, update_time, del_flag, factory_id, data_source, schame, line_flag from wms_base_warehouse
select warehouse_id, warehouse_instock_type, warehouse_type, warehouse_code, warehouse_name, warehouse_category_id, warehouse_floor, dept_id, multi_row_type, multi_side_type, batch_mix, product_mix, workbin_flag, warehouse_location, active_flag, in_requirement, out_requirement, return_requirement, auto_flag, return_flag, remark, create_by, create_time, update_by, update_time, del_flag, factory_id, data_source, schame, line_flag from wms_base_warehouse
</sql>
<select id="selectWmsBaseWarehouseList" parameterType="WmsBaseWarehouse" resultMap="WmsBaseWarehouseResult">
@ -99,7 +95,7 @@
<if test="workbinFlag != null and workbinFlag != ''"> and workbin_flag = #{workbinFlag}</if>
<if test="warehouseLocation != null and warehouseLocation != ''"> and warehouse_location = #{warehouseLocation}</if>
<if test="activeFlag != null and activeFlag != ''"> and active_flag = #{activeFlag}</if>
<if test="auditFlag != null and auditFlag != ''"> and audit_flag = #{auditFlag}</if>
<if test="inRequirement != null and inRequirement != ''"> and in_requirement = #{inRequirement}</if>
<if test="returnFlag != null and returnFlag != ''"> and return_flag = #{returnFlag}</if>
<if test="factoryId != null "> and factory_id = #{factoryId}</if>
<if test="dataSource != null and dataSource != ''"> and data_source = #{dataSource}</if>
@ -109,8 +105,8 @@
</select>
<select id="selectWmsBaseWarehouseWithLocationByWarehouseId" parameterType="Long" resultMap="WmsBaseWarehouseWmsBaseLocationResult">
select a.warehouse_id, a.warehouse_instock_type, a.warehouse_type, a.warehouse_code, a.warehouse_name, a.warehouse_category_id, a.warehouse_floor, a.dept_id, a.multi_row_type, a.multi_side_type, a.batch_mix, a.product_mix, a.workbin_flag, a.warehouse_location, a.active_flag, a.audit_flag, a.return_flag, a.remark, a.create_by, a.create_time, a.update_by, a.update_time, a.del_flag, a.factory_id, a.data_source, a.schame, a.line_flag,
b.location_id as sub_location_id, b.warehouse_id as sub_warehouse_id, b.location_code as sub_location_code, b.loc_row as sub_loc_row, b.layer_num as sub_layer_num, b.loc_column as sub_loc_column, b.active_flag as sub_active_flag, b.manual_flag as sub_manual_flag, b.qty_limit as sub_qty_limit, b.instock_flag as sub_instock_flag, b.outstock_flag as sub_outstock_flag, b.location_status as sub_location_status, b.batch_mix as sub_batch_mix, b.create_by as sub_create_by, b.create_time as sub_create_time, b.update_by as sub_update_by, b.update_time as sub_update_time, b.remark as sub_remark, b.del_flag as sub_del_flag, b.shelf_order as sub_shelf_order, b.check_order as sub_check_order, b.pick_order as sub_pick_order, b.pick_flag as sub_pick_flag, b.is_open_kn_flag as sub_is_open_kn_flag, b.location_scrap_type as sub_location_scrap_type, b.location_attr as sub_location_attr, b.turn_demand as sub_turn_demand, b.check_code as sub_check_code, b.work_area as sub_work_area, b.volume_limit as sub_volume_limit, b.weight_limit as sub_weight_limit, b.box_limit as sub_box_limit, b.pallet_limit as sub_pallet_limit, b.length as sub_length, b.width as sub_width, b.height as sub_height
select a.warehouse_id, a.warehouse_instock_type, a.warehouse_type, a.warehouse_code, a.warehouse_name, a.warehouse_category_id, a.warehouse_floor, a.dept_id, a.multi_row_type, a.multi_side_type, a.batch_mix, a.product_mix, a.workbin_flag, a.warehouse_location, a.active_flag, a.in_requirement, a.out_requirement,a.return_requirement,a.auto_flag, a.return_flag, a.remark, a.create_by, a.create_time, a.update_by, a.update_time, a.del_flag, a.factory_id, a.data_source, a.schame, a.line_flag,
b.location_id as sub_location_id, b.warehouse_id as sub_warehouse_id, b.location_code as sub_location_code, b.loc_row as sub_loc_row, b.layer_num as sub_layer_num, b.loc_column as sub_loc_column, b.active_flag as sub_active_flag, b.manual_flag as sub_manual_flag, b.qty_limit as sub_qty_limit, b.instock_flag as sub_instock_flag, b.outstock_flag as sub_outstock_flag, b.location_status as sub_location_status, b.batch_mix as sub_batch_mix, b.create_by as sub_create_by, b.create_time as sub_create_time, b.update_by as sub_update_by, b.update_time as sub_update_time, b.remark as sub_remark, b.del_flag as sub_del_flag, b.shelf_order as sub_shelf_order, b.check_order as sub_check_order, b.pick_order as sub_pick_order, b.pick_flag as sub_pick_flag, b.is_open_kn_flag as sub_is_open_kn_flag, b.location_scrap_type as sub_location_scrap_type, b.volume_limit as sub_volume_limit, b.weight_limit as sub_weight_limit, b.length as sub_length, b.width as sub_width, b.height as sub_height
from wms_base_warehouse a
left join wms_base_location b on b.warehouse_id = a.warehouse_id
where a.warehouse_id = #{warehouseId}
@ -133,7 +129,10 @@
<if test="workbinFlag != null">workbin_flag,</if>
<if test="warehouseLocation != null">warehouse_location,</if>
<if test="activeFlag != null and activeFlag != ''">active_flag,</if>
<if test="auditFlag != null">audit_flag,</if>
<if test="inRequirement != null and inRequirement != ''">in_requirement,</if>
<if test="outRequirement != null and outRequirement != ''">out_requirement,</if>
<if test="returnRequirement != null and returnRequirement != ''">return_requirement,</if>
<if test="autoFlag != null and autoFlag != ''">auto_flag,</if>
<if test="returnFlag != null and returnFlag != ''">return_flag,</if>
<if test="remark != null">remark,</if>
<if test="createBy != null">create_by,</if>
@ -161,7 +160,10 @@
<if test="workbinFlag != null">#{workbinFlag},</if>
<if test="warehouseLocation != null">#{warehouseLocation},</if>
<if test="activeFlag != null and activeFlag != ''">#{activeFlag},</if>
<if test="auditFlag != null">#{auditFlag},</if>
<if test="inRequirement != null and inRequirement != ''">#{inRequirement},</if>
<if test="outRequirement != null and outRequirement != ''">#{outRequirement},</if>
<if test="returnRequirement != null and returnRequirement != ''">#{returnRequirement},</if>
<if test="autoFlag != null and autoFlag != ''">#{autoFlag},</if>
<if test="returnFlag != null and returnFlag != ''">#{returnFlag},</if>
<if test="remark != null">#{remark},</if>
<if test="createBy != null">#{createBy},</if>
@ -193,7 +195,10 @@
<if test="workbinFlag != null">workbin_flag = #{workbinFlag},</if>
<if test="warehouseLocation != null">warehouse_location = #{warehouseLocation},</if>
<if test="activeFlag != null and activeFlag != ''">active_flag = #{activeFlag},</if>
<if test="auditFlag != null">audit_flag = #{auditFlag},</if>
<if test="inRequirement != null and inRequirement != ''">in_requirement = #{inRequirement},</if>
<if test="outRequirement != null and outRequirement != ''">out_requirement = #{outRequirement},</if>
<if test="returnRequirement != null and returnRequirement != ''">return_requirement = #{returnRequirement},</if>
<if test="autoFlag != null and autoFlag != ''">auto_flag = #{autoFlag},</if>
<if test="returnFlag != null and returnFlag != ''">return_flag = #{returnFlag},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="createBy != null">create_by = #{createBy},</if>
@ -232,9 +237,9 @@
</delete>
<insert id="batchWmsBaseLocation">
insert into wms_base_location( location_id, warehouse_id, location_code, loc_row, layer_num, loc_column, active_flag, manual_flag, qty_limit, instock_flag, outstock_flag, location_status, batch_mix, create_by, create_time, update_by, update_time, remark, del_flag, shelf_order, check_order, pick_order, pick_flag, is_open_kn_flag, location_scrap_type, location_attr, turn_demand, check_code, work_area, volume_limit, weight_limit, box_limit, pallet_limit, length, width, height) values
insert into wms_base_location( location_id, warehouse_id, location_code, loc_row, layer_num, loc_column, active_flag, manual_flag, qty_limit, instock_flag, outstock_flag, location_status, batch_mix, create_by, create_time, update_by, update_time, remark, del_flag, shelf_order, check_order, pick_order, pick_flag, is_open_kn_flag, location_scrap_type, volume_limit, weight_limit, length, width, height) values
<foreach item="item" index="index" collection="list" separator=",">
( #{item.locationId}, #{item.warehouseId}, #{item.locationCode}, #{item.locRow}, #{item.layerNum}, #{item.locColumn}, #{item.activeFlag}, #{item.manualFlag}, #{item.qtyLimit}, #{item.instockFlag}, #{item.outstockFlag}, #{item.locationStatus}, #{item.batchMix}, #{item.createBy}, #{item.createTime}, #{item.updateBy}, #{item.updateTime}, #{item.remark}, #{item.delFlag}, #{item.shelfOrder}, #{item.checkOrder}, #{item.pickOrder}, #{item.pickFlag}, #{item.isOpenKnFlag}, #{item.locationScrapType}, #{item.locationAttr}, #{item.turnDemand}, #{item.checkCode}, #{item.workArea}, #{item.volumeLimit}, #{item.weightLimit}, #{item.boxLimit}, #{item.palletLimit}, #{item.length}, #{item.width}, #{item.height})
( #{item.locationId}, #{item.warehouseId}, #{item.locationCode}, #{item.locRow}, #{item.layerNum}, #{item.locColumn}, #{item.activeFlag}, #{item.manualFlag}, #{item.qtyLimit}, #{item.instockFlag}, #{item.outstockFlag}, #{item.locationStatus}, #{item.batchMix}, #{item.createBy}, #{item.createTime}, #{item.updateBy}, #{item.updateTime}, #{item.remark}, #{item.delFlag}, #{item.shelfOrder}, #{item.checkOrder}, #{item.pickOrder}, #{item.pickFlag}, #{item.isOpenKnFlag}, #{item.locationScrapType}, #{item.locationAttr}, #{item.turnDemand}, #{item.checkCode}, #{item.workArea}, #{item.volumeLimit}, #{item.weightLimit}, #{item.length}, #{item.width}, #{item.height})
</foreach>
</insert>
@ -244,10 +249,10 @@
<select id="selectWmsBaseWarehouseJoinList" parameterType="WmsBaseWarehouse" resultMap="WmsBaseWarehouseResult">
select wbw.warehouse_id, wbw.warehouse_instock_type, wbw.warehouse_type, wbw.warehouse_code, wbw.warehouse_name,
wbw.warehouse_category_id, wbw.warehouse_floor, wbw.dept_id, wbw.multi_row_type, wbw.multi_side_type, wbw.batch_mix,
wbw.product_mix, wbw.workbin_flag, wbw.warehouse_location, wbw.active_flag, wbw.audit_flag, wbw.return_flag,wbc.category_name
wbw.product_mix, wbw.workbin_flag, wbw.warehouse_location, wbw.active_flag, wbw.in_requirement,
wbw.out_requirement,wbw.return_requirement,wbw.auto_flag,
wbw.return_flag,wbc.category_name
from wms_base_warehouse wbw left join wms_base_category wbc on wbw.warehouse_category_id = wbc.category_id
<where>
<if test="warehouseInstockType != null and warehouseInstockType != ''"> and warehouse_instock_type = #{warehouseInstockType}</if>
<if test="warehouseType != null and warehouseType != ''"> and warehouse_type = #{warehouseType}</if>
@ -263,7 +268,8 @@
<if test="workbinFlag != null and workbinFlag != ''"> and workbin_flag = #{workbinFlag}</if>
<if test="warehouseLocation != null and warehouseLocation != ''"> and warehouse_location like concat('%', #{warehouseLocation}, '%')</if>
<if test="activeFlag != null and activeFlag != ''"> and active_flag = #{activeFlag}</if>
<if test="auditFlag != null and auditFlag != ''"> and audit_flag = #{auditFlag}</if>
<if test="inRequirement != null and inRequirement != ''"> and in_requirement = #{inRequirement}</if>
<if test="outRequirement != null and outRequirement != ''"> and out_requirement = #{outRequirement}</if>
<if test="returnFlag != null and returnFlag != ''"> and return_flag = #{returnFlag}</if>
<if test="factoryId != null "> and factory_id = #{factoryId}</if>
</where>
@ -271,7 +277,12 @@
<select id="selectWmsBaseWarehouseByWarehouseId" parameterType="Long" resultMap="WmsBaseWarehouseResult">
select a.warehouse_id, a.warehouse_instock_type, a.warehouse_type, a.warehouse_code, a.warehouse_name, a.warehouse_category_id, a.warehouse_floor, a.dept_id, a.multi_row_type, a.multi_side_type, a.batch_mix, a.product_mix, a.workbin_flag, a.warehouse_location, a.active_flag, a.audit_flag, a.return_flag, a.remark, a.create_by, a.create_time, a.update_by, a.update_time, a.del_flag, a.factory_id, a.data_source, a.schame, a.line_flag
select a.warehouse_id, a.warehouse_instock_type, a.warehouse_type, a.warehouse_code, a.warehouse_name,
a.warehouse_category_id, a.warehouse_floor, a.dept_id, a.multi_row_type,
a.multi_side_type, a.batch_mix, a.product_mix, a.workbin_flag, a.warehouse_location,
a.active_flag, a.in_requirement, a.out_requirement,a.return_requirement,a.auto_flag,
a.return_flag, a.remark, a.create_by, a.create_time, a.update_by, a.update_time, a.del_flag,
a.factory_id, a.data_source, a.schame, a.line_flag
from wms_base_warehouse a
where a.warehouse_id = #{warehouseId}
</select>

2
hw-modules/hw-wms/src/main/resources/mapper/wms/WmsProductOutstockDetailMapper.xml
Unescape Escape View File

@ -14,6 +14,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="productId" column="product_id" />
<result property="planAmount" column="plan_amount" />
<result property="outstockAmount" column="outstock_amount" />
<result property="confirmAmount" column="confirm_amount" />
<result property="executeStatus" column="execute_status" />
<result property="erpStatus" column="erp_status" />
<result property="updateBy" column="update_by" />
@ -98,6 +99,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="productId != null">product_id = #{productId},</if>
<if test="planAmount != null">plan_amount = #{planAmount},</if>
<if test="outstockAmount != null">outstock_amount = #{outstockAmount},</if>
<if test="confirmAmount != null">confirm_amount = #{confirmAmount},</if>
<if test="executeStatus != null and executeStatus != ''">execute_status = #{executeStatus},</if>
<if test="erpStatus != null">erp_status = #{erpStatus},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>

159
hw-modules/hw-wms/src/main/resources/mapper/wms/WmsProductStockSaleorderMapper.xml
Unescape Escape View File

@ -0,0 +1,159 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.hw.wms.mapper.WmsProductStockSaleorderMapper">
<resultMap type="WmsProductStockSaleorder" id="WmsProductStockSaleorderResult">
<result property="productStockSaleorderId" column="product_stock_saleorder_id" />
<result property="warehouseId" column="warehouse_id" />
<result property="warehouseFloor" column="warehouse_floor" />
<result property="stockType" column="stock_type" />
<result property="productId" column="product_id" />
<result property="saleOrderId" column="sale_order_id" />
<result property="saleorderCode" column="saleorder_code" />
<result property="totalAmount" column="total_amount" />
<result property="occupyAmount" column="occupy_amount" />
<result property="frozenAmount" column="frozen_amount" />
<result property="applyAmount" column="apply_amount" />
<result property="outstockAmount" column="outstock_amount" />
<result property="confirmAmount" column="confirm_amount" />
<result property="createBy" column="create_by" />
<result property="createDate" column="create_date" />
<result property="updateBy" column="update_by" />
<result property="updateDate" column="update_date" />
<result property="activeFlag" column="active_flag" />
</resultMap>
<sql id="selectWmsProductStockSaleorderVo">
select product_stock_saleorder_id, warehouse_id, warehouse_floor, stock_type, product_id, sale_order_id, saleorder_code, total_amount, occupy_amount, frozen_amount, apply_amount, outstock_amount, confirm_amount, create_by, create_date, update_by, update_date, active_flag from wms_product_stock_saleorder
</sql>
<select id="selectWmsProductStockSaleorderList" parameterType="WmsProductStockSaleorder" resultMap="WmsProductStockSaleorderResult">
<include refid="selectWmsProductStockSaleorderVo"/>
<where>
<if test="warehouseId != null "> and warehouse_id = #{warehouseId}</if>
<if test="warehouseFloor != null "> and warehouse_floor = #{warehouseFloor}</if>
<if test="stockType != null and stockType != ''"> and stock_type = #{stockType}</if>
<if test="productId != null "> and product_id = #{productId}</if>
<if test="saleOrderId != null "> and sale_order_id = #{saleOrderId}</if>
<if test="saleorderCode != null and saleorderCode != ''"> and saleorder_code = #{saleorderCode}</if>
<if test="totalAmount != null "> and total_amount = #{totalAmount}</if>
<if test="occupyAmount != null "> and occupy_amount = #{occupyAmount}</if>
<if test="frozenAmount != null "> and frozen_amount = #{frozenAmount}</if>
<if test="applyAmount != null "> and apply_amount = #{applyAmount}</if>
<if test="outstockAmount != null "> and outstock_amount = #{outstockAmount}</if>
<if test="confirmAmount != null "> and confirm_amount = #{confirmAmount}</if>
<if test="createDate != null "> and create_date = #{createDate}</if>
<if test="updateDate != null "> and update_date = #{updateDate}</if>
<if test="activeFlag != null and activeFlag != ''"> and active_flag = #{activeFlag}</if>
</where>
</select>
<select id="selectWmsProductStockSaleorderByProductStockSaleorderId" parameterType="Long" resultMap="WmsProductStockSaleorderResult">
<include refid="selectWmsProductStockSaleorderVo"/>
where product_stock_saleorder_id = #{productStockSaleorderId}
</select>
<insert id="insertWmsProductStockSaleorder" parameterType="WmsProductStockSaleorder" useGeneratedKeys="true" keyProperty="productStockSaleorderId">
insert into wms_product_stock_saleorder
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="warehouseId != null">warehouse_id,</if>
<if test="warehouseFloor != null">warehouse_floor,</if>
<if test="stockType != null and stockType != ''">stock_type,</if>
<if test="productId != null">product_id,</if>
<if test="saleOrderId != null">sale_order_id,</if>
<if test="saleorderCode != null">saleorder_code,</if>
<if test="totalAmount != null">total_amount,</if>
<if test="occupyAmount != null">occupy_amount,</if>
<if test="frozenAmount != null">frozen_amount,</if>
<if test="applyAmount != null">apply_amount,</if>
<if test="outstockAmount != null">outstock_amount,</if>
<if test="confirmAmount != null">confirm_amount,</if>
<if test="createBy != null">create_by,</if>
<if test="createDate != null">create_date,</if>
<if test="updateBy != null">update_by,</if>
<if test="updateDate != null">update_date,</if>
<if test="activeFlag != null">active_flag,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="warehouseId != null">#{warehouseId},</if>
<if test="warehouseFloor != null">#{warehouseFloor},</if>
<if test="stockType != null and stockType != ''">#{stockType},</if>
<if test="productId != null">#{productId},</if>
<if test="saleOrderId != null">#{saleOrderId},</if>
<if test="saleorderCode != null">#{saleorderCode},</if>
<if test="totalAmount != null">#{totalAmount},</if>
<if test="occupyAmount != null">#{occupyAmount},</if>
<if test="frozenAmount != null">#{frozenAmount},</if>
<if test="applyAmount != null">#{applyAmount},</if>
<if test="outstockAmount != null">#{outstockAmount},</if>
<if test="confirmAmount != null">#{confirmAmount},</if>
<if test="createBy != null">#{createBy},</if>
<if test="createDate != null">#{createDate},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updateDate != null">#{updateDate},</if>
<if test="activeFlag != null">#{activeFlag},</if>
</trim>
</insert>
<update id="updateWmsProductStockSaleorder" parameterType="WmsProductStockSaleorder">
update wms_product_stock_saleorder
<trim prefix="SET" suffixOverrides=",">
<if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
<if test="warehouseFloor != null">warehouse_floor = #{warehouseFloor},</if>
<if test="stockType != null and stockType != ''">stock_type = #{stockType},</if>
<if test="productId != null">product_id = #{productId},</if>
<if test="saleOrderId != null">sale_order_id = #{saleOrderId},</if>
<if test="saleorderCode != null">saleorder_code = #{saleorderCode},</if>
<if test="totalAmount != null">total_amount = #{totalAmount},</if>
<if test="occupyAmount != null">occupy_amount = #{occupyAmount},</if>
<if test="frozenAmount != null">frozen_amount = #{frozenAmount},</if>
<if test="applyAmount != null">apply_amount = #{applyAmount},</if>
<if test="outstockAmount != null">outstock_amount = #{outstockAmount},</if>
<if test="confirmAmount != null">confirm_amount = #{confirmAmount},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="createDate != null">create_date = #{createDate},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateDate != null">update_date = #{updateDate},</if>
<if test="activeFlag != null">active_flag = #{activeFlag},</if>
</trim>
where product_stock_saleorder_id = #{productStockSaleorderId}
</update>
<delete id="deleteWmsProductStockSaleorderByProductStockSaleorderId" parameterType="Long">
delete from wms_product_stock_saleorder where product_stock_saleorder_id = #{productStockSaleorderId}
</delete>
<delete id="deleteWmsProductStockSaleorderByProductStockSaleorderIds" parameterType="String">
delete from wms_product_stock_saleorder where product_stock_saleorder_id in
<foreach item="productStockSaleorderId" collection="array" open="(" separator="," close=")">
#{productStockSaleorderId}
</foreach>
</delete>
<select id="selectWmsProductStockSaleorderJoinList" parameterType="WmsProductStockSaleorder" resultMap="WmsProductStockSaleorderResult">
select wpss.product_stock_saleorder_id, wpss.warehouse_id, wpss.warehouse_floor, wpss.stock_type, wpss.product_id, wpss.saleorder_code,
wpss.total_amount,wpss.apply_amount, wpss.occupy_amount,wpss.frozen_amount,wpss.outstock_amount, wpss.confirm_amount,
mso.order_amount,wbw.warehouse_name,mbmi.material_code,mbmi.material_name
from wms_product_stock_saleorder wpss left join mes_sale_order mso on wpss.sale_order_id = mso.sale_order_id
left join wms_base_warehouse wbw on wpss.warehouse_id=wbw.warehouse_id
left join mes_base_material_info mbmi on mbmi.material_id=wpss.product_id
<where>
<if test="saleorderCode != null and saleorderCode != ''"> and wpss.saleorder_code = #{saleorderCode}</if>
<if test="warehouseId != null ">and wpss.warehouse_id = #{warehouseId}</if>
<if test="productId != null ">and wpss.product_id = #{productId}</if>
</where>
</select>
</mapper>

2
hw-ui/src/views/ems/base/dianMeasurement/index.vue
Unescape Escape View File

@ -511,7 +511,7 @@ export default {
// 遮罩层
loading: true,
// 返回条数
list: null,
list: [],
// 显示搜索条件
showSearch: true,
// 计量设备信息表格数据

4
hw-ui/src/views/wms/base/wmslocation/index.vue
Unescape Escape View File

@ -427,8 +427,8 @@ import {
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
// import toggleMenuLeftImg from '@/assets/images/togglemenu-left.png'
// import toggleMenuRightImg from '@/assets/images/togglemenu-right.png'
import toggleMenuLeftImg from '@/assets/images/togglemenu-left.png'
import toggleMenuRightImg from '@/assets/images/togglemenu-right.png'
export default {
name: "Wmslocation",

143
hw-ui/src/views/wms/base/wmswarehouse/index.vue
Unescape Escape View File

@ -68,14 +68,14 @@
/>
</el-form-item>
<el-form-item label="审核标识" prop="auditFlag">
<el-form-item label="入库要求" prop="inRequirement">
<el-select
v-model="queryParams.auditFlag"
placeholder="请选择审核标识"
v-model="queryParams.inRequirement"
placeholder="请选择入库要求"
clearable
>
<el-option
v-for="dict in dict.type.wms_audit_flag"
v-for="dict in dict.type.wms_in_requirement"
:key="dict.value"
:label="dict.label"
:value="dict.value"
@ -83,6 +83,51 @@
</el-select>
</el-form-item>
<el-form-item label="出库要求" prop="outRequirement">
<el-select
v-model="queryParams.outRequirement"
placeholder="请选择出库要求"
clearable
>
<el-option
v-for="dict in dict.type.wms_out_requirement"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="出库要求" prop="outRequirement">
<el-select
v-model="queryParams.outRequirement"
placeholder="请选择出库要求"
clearable
>
<el-option
v-for="dict in dict.type.wms_out_requirement"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="退库要求" prop="returnRequirement">
<el-select
v-model="queryParams.returnRequirement"
placeholder="请选择退库要求"
clearable
>
<el-option
v-for="dict in dict.type.wms_in_requirement"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="激活标识" prop="activeFlag">
<el-select
v-model="queryParams.activeFlag"
@ -167,9 +212,9 @@
</template>
</el-table-column>
<el-table-column label="楼层" align="center" prop="warehouseFloor" />
<el-table-column label="审核标识 " align="center" prop="auditFlag" >
<el-table-column label="入库要求 " align="center" prop="inRequirement" >
<template slot-scope="scope">
<dict-tag :options="dict.type.wms_audit_flag" :value="scope.row.auditFlag"/>
<dict-tag :options="dict.type.wms_in_requirement" :value="scope.row.inRequirement"/>
</template>
</el-table-column>
<el-table-column label="激活标识" align="center" prop="activeFlag" >
@ -378,18 +423,55 @@
<el-row>
<el-col :span="12">
<el-form-item label="审核标识" prop="auditFlag">
<el-radio-group v-model="form.auditFlag" :disabled="disableFlag">
<el-form-item label="入库要求" prop="inRequirement">
<el-radio-group v-model="form.inRequirement" :disabled="disableFlag">
<el-radio
v-for="dict in dict.type.wms_audit_flag"
:key="dict.value"
:label="dict.value"
v-for="dict in dict.type.wms_in_requirement"
:key="dict.value"
:label="dict.value"
>{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="12">
</el-row>
<el-row>
<el-form-item label="出库要求" prop="outRequirement">
<el-radio-group v-model="form.outRequirement" :disabled="disableFlag">
<el-radio
v-for="dict in dict.type.wms_out_requirement"
:key="dict.value"
:label="dict.value"
>{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="退库要求" prop="returnRequirement">
<el-radio-group v-model="form.returnRequirement" :disabled="disableFlag">
<el-radio
v-for="dict in dict.type.wms_return_requirement"
:key="dict.value"
:label="dict.value"
>{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="自动标识" prop="autoFlag">
<el-radio-group v-model="form.autoFlag" :disabled="disableFlag">
<el-radio
v-for="dict in dict.type.wms_auto_flag"
:key="dict.value"
:label="dict.value"
>{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="激活标识" prop="activeFlag">
<el-radio-group v-model="form.activeFlag">
<el-radio
@ -399,7 +481,6 @@
>{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
@ -432,7 +513,8 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
export default {
name: "Wmswarehouse",
dicts: ['wms_warehouse_instock_type', 'wms_warehouse_type','wms_multi_row_type','wms_multi_side_type','wms_batch_mix_flag','wms_product_mix_flag','wms_audit_flag',
dicts: ['wms_warehouse_instock_type', 'wms_warehouse_type','wms_multi_row_type','wms_multi_side_type','wms_batch_mix_flag','wms_product_mix_flag',
'wms_in_requirement','wms_out_requirement','wms_return_requirement','wms_auto_flag',
'wms_return_flag','wms_workbin_flag','wms_warehouse_active_flag'],
components: {Treeselect},
data() {
@ -481,7 +563,7 @@ export default {
workbinFlag: null,
warehouseLocation: null,
activeFlag: null,
auditFlag: null,
inRequirement: null,
returnFlag: null,
factoryId: null,
dataSource: null,
@ -494,8 +576,15 @@ export default {
WAREHOUSE_TYPE_AGV:'2',//背负agv仓库
WAREHOUSE_TYPE_CTU:'3',//料箱agv仓库
AUDIT_FLAG_YES:'1',
AUDIT_FLAG_NO:'0',
IN_REQUIREMENT_APPLY:'0',
OUT_REQUIREMENT_APPLY:'0',//申请出库，agv仓库默认
OUT_REQUIREMENT_APPLY_AUDIT:'1',//申请审核出库，普通仓库默认
RETURN_REQUIREMENT_APPLY_AUDIT:'1',//申请审核退库
AUTO_FLAG_MANUAL:'0',//全人工
BATCH_MIX_NO:'0',
@ -551,8 +640,17 @@ export default {
workbinFlag: [
{ required: true, message: "激活标识不能为空", trigger: "blur" }
],
auditFlag: [
{ required: true, message: "返库标识(1是，0否)不能为空", trigger: "blur" }
inRequirement: [
{ required: true, message: "入库要求不能为空", trigger: "blur" }
],
outRequirement: [
{ required: true, message: "出库要求不能为空", trigger: "blur" }
],
returnRequirement: [
{ required: true, message: "退库要求不能为空", trigger: "blur" }
],
autoFlag: [
{ required: true, message: "自动标识不能为空", trigger: "blur" }
],
activeFlag: [
{ required: true, message: "激活标记不能为空", trigger: "blur" }
@ -601,7 +699,7 @@ export default {
workbinFlag: this.globalVariables.WORKBIN_FLAG_NO,
warehouseLocation: null,
activeFlag: this.globalVariables.ACTIVE_FLAG_YES,
auditFlag: this.globalVariables.AUDIT_FLAG_NO,
inRequirement: this.globalVariables.IN_REQUIREMENT_APPLY,
returnFlag: this.globalVariables.RETURN_FLAG_NO,
remark: null,
createBy: null,
@ -714,7 +812,6 @@ export default {
warehouseTypeChange(value){
if(value == this.globalVariables.WAREHOUSE_TYPE_AGV){
this.form.auditFlag = this.globalVariables.AUDIT_FLAG_NO;
this.form.productMix = this.globalVariables.PRODUCT_MIX_NO;
this.form.batchMix = this.globalVariables.BATCH_MIX_NO;
this.disableFlag = true;

Write Preview
Loading…
Cancel
Save