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

优化

Browse Source
This commit is contained in:
zj
2025-12-19 11:17:34 +08:00
parent 48b1b590a7
commit c62b3346f7
27 changed files with 2819 additions and 3123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java
View File

@@ -43,6 +43,8 @@ import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
import java.math.BigDecimal;
import java.text.ParsePosition;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
@@ -129,7 +131,11 @@ public class MydoJobServiceImpl implements IMydoJobService {
*/
@Override
public int insertMydoJob(MydoJob mydoJob) {
mydoJob.setCreateTime(new Date());
//时间日期处理 新增
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String date = sdf.format(new Date());
ParsePosition pos = new ParsePosition(0);
mydoJob.setCreateTime(sdf.parse(date, pos));
mydoJob.setJobId(basJobIdService.getJobId("RK"));
mydoJob.setTaskNo(Convert.toStr(basTaskNoService.getTaskNo("1")));
return mydoJobMapper.insertMydoJob(mydoJob);
@@ -455,12 +461,12 @@ public class MydoJobServiceImpl implements IMydoJobService {
updateMydoJob(job);
insertHistory(jobId);
//通知wcs
AjaxResult ajaxResult = iToWcsService.cancelTaskByTaskNo(job.getTaskNo());
if (ajaxResult.isSuccess()){
return AjaxResult.success();
}else {
throw new RuntimeException(Convert.toStr(ajaxResult.get("msg")));
}
// AjaxResult ajaxResult = iToWcsService.cancelTaskByTaskNo(job.getTaskNo());
// if (ajaxResult.isSuccess()){
// return AjaxResult.success();
// }else {
// throw new RuntimeException(Convert.toStr(ajaxResult.get("msg")));
// }
}
} catch (Exception e) {
@@ -475,23 +481,18 @@ public class MydoJobServiceImpl implements IMydoJobService {
public AjaxResult pointOut(String[] stockIds, String exitId) {
HashMap<String, Object> map = new HashMap<>();
String msg = "";
String Stringbuilder = "";
StringBuilder builder = new StringBuilder();
for (String stockId : stockIds) {
map.put("v_stock_id", stockId);
map.put("v_exit_id", exitId);
mydoJobMapper.pointOut(map);
iToWcsService.pushOutMydoJob();
String result = map.get("v_result").toString();
if (!"10".equals(result)) {
Stringbuilder += stockId + msg + "<br/>";
}
msg = map.get("v_resultmsg").toString();
builder.append("库存编号：" + stockId + "，分配结果：" + msg + "<br/>");
}
if (!StrUtil.isEmpty(Stringbuilder)) {
return AjaxResult.warn(Stringbuilder);
iToWcsService.pushOutMydoJob();
if (!StrUtil.isEmpty(builder)) {
return AjaxResult.warn(builder.toString());
}
return AjaxResult.success();
}

391
ruoyi-admin/src/main/java/com/ruoyi/out/handAllotStock/domain/ViewHandAllotStock.java
View File

@@ -164,447 +164,358 @@ public class ViewHandAllotStock extends BaseEntity
@Excel(name = "货位名称")
private String cargoSpaceName;
private Integer thePlatoon;
private Integer theColumn;
private Integer theFloor;
@Excel(name = "排")
private String thePlatoon;
@Excel(name = "列")
private String theColumn;
@Excel(name = "层")
private String theFloor;
@Excel(name = "巷道")
private String roadwayId;
private String status;
private String locked;
public void setStockId(String stockId)
{
this.stockId = stockId;
}
public String getStockId()
{
public String getStockId() {
return stockId;
}
public void setCargoSpaceId(String cargoSpaceId)
{
this.cargoSpaceId = cargoSpaceId;
public void setStockId(String stockId) {
this.stockId = stockId;
}
public String getCargoSpaceId()
{
public String getCargoSpaceId() {
return cargoSpaceId;
}
public void setStockStatus(String stockStatus)
{
this.stockStatus = stockStatus;
public void setCargoSpaceId(String cargoSpaceId) {
this.cargoSpaceId = cargoSpaceId;
}
public String getStockStatus()
{
public String getStockStatus() {
return stockStatus;
}
public void setProductStatus(String productStatus)
{
this.productStatus = productStatus;
public void setStockStatus(String stockStatus) {
this.stockStatus = stockStatus;
}
public String getProductStatus()
{
public String getProductStatus() {
return productStatus;
}
public void setLotNo(String lotNo)
{
this.lotNo = lotNo;
public void setProductStatus(String productStatus) {
this.productStatus = productStatus;
}
public String getLotNo()
{
public String getLotNo() {
return lotNo;
}
public void setInDate(String inDate)
{
this.inDate = inDate;
public void setLotNo(String lotNo) {
this.lotNo = lotNo;
}
public String getInDate()
{
public String getInDate() {
return inDate;
}
public void setBackDate(String backDate)
{
this.backDate = backDate;
public void setInDate(String inDate) {
this.inDate = inDate;
}
public String getBackDate()
{
public String getBackDate() {
return backDate;
}
public void setProductGuid(String productGuid)
{
this.productGuid = productGuid;
public void setBackDate(String backDate) {
this.backDate = backDate;
}
public String getProductGuid()
{
public String getProductGuid() {
return productGuid;
}
public void setQuantity(BigDecimal quantity)
{
this.quantity = quantity;
public void setProductGuid(String productGuid) {
this.productGuid = productGuid;
}
public BigDecimal getQuantity()
{
public BigDecimal getQuantity() {
return quantity;
}
public void setJobId(String jobId)
{
this.jobId = jobId;
public void setQuantity(BigDecimal quantity) {
this.quantity = quantity;
}
public String getJobId()
{
public String getJobId() {
return jobId;
}
public void setTrayCode(String trayCode)
{
this.trayCode = trayCode;
public void setJobId(String jobId) {
this.jobId = jobId;
}
public String getTrayCode()
{
public String getTrayCode() {
return trayCode;
}
public void setOutQuantity(String outQuantity)
{
this.outQuantity = outQuantity;
public void setTrayCode(String trayCode) {
this.trayCode = trayCode;
}
public String getOutQuantity()
{
public String getOutQuantity() {
return outQuantity;
}
public void setStockinDetailId(String stockinDetailId)
{
this.stockinDetailId = stockinDetailId;
public void setOutQuantity(String outQuantity) {
this.outQuantity = outQuantity;
}
public String getStockinDetailId()
{
public String getStockinDetailId() {
return stockinDetailId;
}
public void setStockinId(String stockinId)
{
this.stockinId = stockinId;
public void setStockinDetailId(String stockinDetailId) {
this.stockinDetailId = stockinDetailId;
}
public String getStockinId()
{
public String getStockinId() {
return stockinId;
}
public void setInType(String inType)
{
this.inType = inType;
public void setStockinId(String stockinId) {
this.stockinId = stockinId;
}
public String getInType()
{
public String getInType() {
return inType;
}
public void setInClassId(String inClassId)
{
this.inClassId = inClassId;
public void setInType(String inType) {
this.inType = inType;
}
public String getInClassId()
{
public String getInClassId() {
return inClassId;
}
public void setWarehouseId(String warehouseId)
{
this.warehouseId = warehouseId;
public void setInClassId(String inClassId) {
this.inClassId = inClassId;
}
public String getWarehouseId()
{
public String getWarehouseId() {
return warehouseId;
}
public void setStackingId(String stackingId)
{
this.stackingId = stackingId;
public void setWarehouseId(String warehouseId) {
this.warehouseId = warehouseId;
}
public String getStackingId()
{
public String getStackingId() {
return stackingId;
}
public void setSpare1(String spare1)
{
this.spare1 = spare1;
public void setStackingId(String stackingId) {
this.stackingId = stackingId;
}
public String getSpare1()
{
public String getSpare1() {
return spare1;
}
public void setSpare2(String spare2)
{
this.spare2 = spare2;
public void setSpare1(String spare1) {
this.spare1 = spare1;
}
public String getSpare2()
{
public String getSpare2() {
return spare2;
}
public void setSpare3(String spare3)
{
this.spare3 = spare3;
public void setSpare2(String spare2) {
this.spare2 = spare2;
}
public String getSpare3()
{
public String getSpare3() {
return spare3;
}
public void setSpare4(String spare4)
{
this.spare4 = spare4;
public void setSpare3(String spare3) {
this.spare3 = spare3;
}
public String getSpare4()
{
public String getSpare4() {
return spare4;
}
public void setSpare5(String spare5)
{
this.spare5 = spare5;
public void setSpare4(String spare4) {
this.spare4 = spare4;
}
public String getSpare5()
{
public String getSpare5() {
return spare5;
}
public void setSpare6(String spare6)
{
this.spare6 = spare6;
public void setSpare5(String spare5) {
this.spare5 = spare5;
}
public String getSpare6()
{
public String getSpare6() {
return spare6;
}
public void setProductId(String productId)
{
this.productId = productId;
public void setSpare6(String spare6) {
this.spare6 = spare6;
}
public String getProductId()
{
public String getProductId() {
return productId;
}
public void setProductName(String productName)
{
this.productName = productName;
public void setProductId(String productId) {
this.productId = productId;
}
public String getProductName()
{
public String getProductName() {
return productName;
}
public void setVoltage(String voltage)
{
this.voltage = voltage;
public void setProductName(String productName) {
this.productName = productName;
}
public String getVoltage()
{
public String getVoltage() {
return voltage;
}
public void setPower(String power)
{
this.power = power;
public void setVoltage(String voltage) {
this.voltage = voltage;
}
public String getPower()
{
public String getPower() {
return power;
}
public void setPhase(String phase)
{
this.phase = phase;
public void setPower(String power) {
this.power = power;
}
public String getPhase()
{
public String getPhase() {
return phase;
}
public void setNetWeight(BigDecimal netWeight)
{
this.netWeight = netWeight;
public void setPhase(String phase) {
this.phase = phase;
}
public BigDecimal getNetWeight()
{
public BigDecimal getNetWeight() {
return netWeight;
}
public void setGrossWeight(BigDecimal grossWeight)
{
this.grossWeight = grossWeight;
public void setNetWeight(BigDecimal netWeight) {
this.netWeight = netWeight;
}
public BigDecimal getGrossWeight()
{
public BigDecimal getGrossWeight() {
return grossWeight;
}
public void setDistribution(String distribution)
{
this.distribution = distribution;
public void setGrossWeight(BigDecimal grossWeight) {
this.grossWeight = grossWeight;
}
public String getDistribution()
{
public String getDistribution() {
return distribution;
}
public void setModel(String model)
{
this.model = model;
public void setDistribution(String distribution) {
this.distribution = distribution;
}
public String getModel()
{
public String getModel() {
return model;
}
public void setOrderId(String orderId)
{
this.orderId = orderId;
public void setModel(String model) {
this.model = model;
}
public String getOrderId()
{
public String getOrderId() {
return orderId;
}
public void setSpare7(String spare7)
{
this.spare7 = spare7;
public void setOrderId(String orderId) {
this.orderId = orderId;
}
public String getSpare7()
{
public String getSpare7() {
return spare7;
}
public void setSpare8(String spare8)
{
this.spare8 = spare8;
public void setSpare7(String spare7) {
this.spare7 = spare7;
}
public String getSpare8()
{
public String getSpare8() {
return spare8;
}
public void setCargoSpaceName(String cargoSpaceName)
{
this.cargoSpaceName = cargoSpaceName;
public void setSpare8(String spare8) {
this.spare8 = spare8;
}
public String getCargoSpaceName()
{
public String getCargoSpaceName() {
return cargoSpaceName;
}
public Integer getThePlatoon() {
public void setCargoSpaceName(String cargoSpaceName) {
this.cargoSpaceName = cargoSpaceName;
}
public String getThePlatoon() {
return thePlatoon;
}
public void setThePlatoon(Integer thePlatoon) {
public void setThePlatoon(String thePlatoon) {
this.thePlatoon = thePlatoon;
}
public Integer getTheColumn() {
public String getTheColumn() {
return theColumn;
}
public void setTheColumn(Integer theColumn) {
public void setTheColumn(String theColumn) {
this.theColumn = theColumn;
}
public Integer getTheFloor() {
public String getTheFloor() {
return theFloor;
}
public void setTheFloor(Integer theFloor) {
public void setTheFloor(String theFloor) {
this.theFloor = theFloor;
}
@Override
public String toString() {
return "ViewHandAllotStock{" +
"stockId='" + stockId + '\'' +
", cargoSpaceId='" + cargoSpaceId + '\'' +
", stockStatus='" + stockStatus + '\'' +
", productStatus='" + productStatus + '\'' +
", lotNo='" + lotNo + '\'' +
", inDate='" + inDate + '\'' +
", backDate='" + backDate + '\'' +
", productGuid='" + productGuid + '\'' +
", quantity=" + quantity +
", jobId='" + jobId + '\'' +
", trayCode='" + trayCode + '\'' +
", outQuantity='" + outQuantity + '\'' +
", stockinDetailId='" + stockinDetailId + '\'' +
", stockinId='" + stockinId + '\'' +
", inType='" + inType + '\'' +
", inClassId='" + inClassId + '\'' +
", warehouseId='" + warehouseId + '\'' +
", stackingId='" + stackingId + '\'' +
", spare1='" + spare1 + '\'' +
", spare2='" + spare2 + '\'' +
", spare3='" + spare3 + '\'' +
", spare4='" + spare4 + '\'' +
", spare5='" + spare5 + '\'' +
", spare6='" + spare6 + '\'' +
", productId='" + productId + '\'' +
", productName='" + productName + '\'' +
", voltage='" + voltage + '\'' +
", power='" + power + '\'' +
", phase='" + phase + '\'' +
", netWeight=" + netWeight +
", grossWeight=" + grossWeight +
", distribution='" + distribution + '\'' +
", model='" + model + '\'' +
", orderId='" + orderId + '\'' +
", spare7='" + spare7 + '\'' +
", spare8='" + spare8 + '\'' +
", cargoSpaceName='" + cargoSpaceName + '\'' +
", thePlatoon=" + thePlatoon +
", theColumn=" + theColumn +
", theFloor=" + theFloor +
'}';
public String getRoadwayId() {
return roadwayId;
}
public void setRoadwayId(String roadwayId) {
this.roadwayId = roadwayId;
}
public String getStatus() {
return status;
}
public void setStatus(String status) {
this.status = status;
}
public String getLocked() {
return locked;
}
public void setLocked(String locked) {
this.locked = locked;
}
}

581
ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockDetail/domain/ViewStockDetail.java
View File

@@ -288,4 +288,585 @@ public class ViewStockDetail extends BaseEntity
@Excel(name = "描述")
private String remark;
private String thePlatoon;
private String theColumn;
private String theFloor;
private String startTime;
private String finishTime;
public Long getOnlyIdentity() {
return onlyIdentity;
}
public void setOnlyIdentity(Long onlyIdentity) {
this.onlyIdentity = onlyIdentity;
}
public String getStockId() {
return stockId;
}
public void setStockId(String stockId) {
this.stockId = stockId;
}
public String getOrderId() {
return orderId;
}
public void setOrderId(String orderId) {
this.orderId = orderId;
}
public String getProductId() {
return productId;
}
public void setProductId(String productId) {
this.productId = productId;
}
public String getProductName() {
return productName;
}
public void setProductName(String productName) {
this.productName = productName;
}
public String getCargoSpaceId() {
return cargoSpaceId;
}
public void setCargoSpaceId(String cargoSpaceId) {
this.cargoSpaceId = cargoSpaceId;
}
public String getCargoSpaceName() {
return cargoSpaceName;
}
public void setCargoSpaceName(String cargoSpaceName) {
this.cargoSpaceName = cargoSpaceName;
}
public String getTrayCode() {
return trayCode;
}
public void setTrayCode(String trayCode) {
this.trayCode = trayCode;
}
public String getQuantity() {
return quantity;
}
public void setQuantity(String quantity) {
this.quantity = quantity;
}
public String getJobId() {
return jobId;
}
public void setJobId(String jobId) {
this.jobId = jobId;
}
public String getLotNo() {
return lotNo;
}
public void setLotNo(String lotNo) {
this.lotNo = lotNo;
}
public String getStockinDetailId() {
return stockinDetailId;
}
public void setStockinDetailId(String stockinDetailId) {
this.stockinDetailId = stockinDetailId;
}
public String getInDate() {
return inDate;
}
public void setInDate(String inDate) {
this.inDate = inDate;
}
public String getWarehouseId() {
return warehouseId;
}
public void setWarehouseId(String warehouseId) {
this.warehouseId = warehouseId;
}
public String getWarehouseName() {
return warehouseName;
}
public void setWarehouseName(String warehouseName) {
this.warehouseName = warehouseName;
}
public String getStackingId() {
return stackingId;
}
public void setStackingId(String stackingId) {
this.stackingId = stackingId;
}
public String getRoadwayId() {
return roadwayId;
}
public void setRoadwayId(String roadwayId) {
this.roadwayId = roadwayId;
}
public String getCargoSpaceStatus() {
return cargoSpaceStatus;
}
public void setCargoSpaceStatus(String cargoSpaceStatus) {
this.cargoSpaceStatus = cargoSpaceStatus;
}
public String getStockStatus() {
return stockStatus;
}
public void setStockStatus(String stockStatus) {
this.stockStatus = stockStatus;
}
public String getProductStatus() {
return productStatus;
}
public void setProductStatus(String productStatus) {
this.productStatus = productStatus;
}
public String getLocked() {
return locked;
}
public void setLocked(String locked) {
this.locked = locked;
}
public String getProductGuid() {
return productGuid;
}
public void setProductGuid(String productGuid) {
this.productGuid = productGuid;
}
public String getSpec() {
return spec;
}
public void setSpec(String spec) {
this.spec = spec;
}
public String getUnit() {
return unit;
}
public void setUnit(String unit) {
this.unit = unit;
}
public String getPrice() {
return price;
}
public void setPrice(String price) {
this.price = price;
}
public String getParentId() {
return parentId;
}
public void setParentId(String parentId) {
this.parentId = parentId;
}
public String getCargoNo() {
return cargoNo;
}
public void setCargoNo(String cargoNo) {
this.cargoNo = cargoNo;
}
public String getSpare1() {
return spare1;
}
public void setSpare1(String spare1) {
this.spare1 = spare1;
}
public String getSpare2() {
return spare2;
}
public void setSpare2(String spare2) {
this.spare2 = spare2;
}
public String getSpare3() {
return spare3;
}
public void setSpare3(String spare3) {
this.spare3 = spare3;
}
public String getSpare4() {
return spare4;
}
public void setSpare4(String spare4) {
this.spare4 = spare4;
}
public String getSpare5() {
return spare5;
}
public void setSpare5(String spare5) {
this.spare5 = spare5;
}
public String getSpare6() {
return spare6;
}
public void setSpare6(String spare6) {
this.spare6 = spare6;
}
public String getSpare7() {
return spare7;
}
public void setSpare7(String spare7) {
this.spare7 = spare7;
}
public String getSpare8() {
return spare8;
}
public void setSpare8(String spare8) {
this.spare8 = spare8;
}
public String getSpare9() {
return spare9;
}
public void setSpare9(String spare9) {
this.spare9 = spare9;
}
public String getSpare10() {
return spare10;
}
public void setSpare10(String spare10) {
this.spare10 = spare10;
}
public String getSpare11() {
return spare11;
}
public void setSpare11(String spare11) {
this.spare11 = spare11;
}
public String getSpare12() {
return spare12;
}
public void setSpare12(String spare12) {
this.spare12 = spare12;
}
public String getSpare13() {
return spare13;
}
public void setSpare13(String spare13) {
this.spare13 = spare13;
}
public String getSpare14() {
return spare14;
}
public void setSpare14(String spare14) {
this.spare14 = spare14;
}
public String getSpare15() {
return spare15;
}
public void setSpare15(String spare15) {
this.spare15 = spare15;
}
public String getSpare16() {
return spare16;
}
public void setSpare16(String spare16) {
this.spare16 = spare16;
}
public String getSpare17() {
return spare17;
}
public void setSpare17(String spare17) {
this.spare17 = spare17;
}
public String getSpare18() {
return spare18;
}
public void setSpare18(String spare18) {
this.spare18 = spare18;
}
public String getSpare19() {
return spare19;
}
public void setSpare19(String spare19) {
this.spare19 = spare19;
}
public String getSpare20() {
return spare20;
}
public void setSpare20(String spare20) {
this.spare20 = spare20;
}
public String getSpare21() {
return spare21;
}
public void setSpare21(String spare21) {
this.spare21 = spare21;
}
public String getSpare22() {
return spare22;
}
public void setSpare22(String spare22) {
this.spare22 = spare22;
}
public String getSpare23() {
return spare23;
}
public void setSpare23(String spare23) {
this.spare23 = spare23;
}
public String getSpare24() {
return spare24;
}
public void setSpare24(String spare24) {
this.spare24 = spare24;
}
public String getSpare25() {
return spare25;
}
public void setSpare25(String spare25) {
this.spare25 = spare25;
}
public String getSpare26() {
return spare26;
}
public void setSpare26(String spare26) {
this.spare26 = spare26;
}
public String getSpare27() {
return spare27;
}
public void setSpare27(String spare27) {
this.spare27 = spare27;
}
public String getSpare28() {
return spare28;
}
public void setSpare28(String spare28) {
this.spare28 = spare28;
}
public String getSpare29() {
return spare29;
}
public void setSpare29(String spare29) {
this.spare29 = spare29;
}
public String getSpare30() {
return spare30;
}
public void setSpare30(String spare30) {
this.spare30 = spare30;
}
public String getSpare31() {
return spare31;
}
public void setSpare31(String spare31) {
this.spare31 = spare31;
}
public String getSpare32() {
return spare32;
}
public void setSpare32(String spare32) {
this.spare32 = spare32;
}
public String getSpare33() {
return spare33;
}
public void setSpare33(String spare33) {
this.spare33 = spare33;
}
public String getSpare34() {
return spare34;
}
public void setSpare34(String spare34) {
this.spare34 = spare34;
}
public String getSpare35() {
return spare35;
}
public void setSpare35(String spare35) {
this.spare35 = spare35;
}
public String getSpare36() {
return spare36;
}
public void setSpare36(String spare36) {
this.spare36 = spare36;
}
public String getSpare37() {
return spare37;
}
public void setSpare37(String spare37) {
this.spare37 = spare37;
}
public String getSpare38() {
return spare38;
}
public void setSpare38(String spare38) {
this.spare38 = spare38;
}
public String getSpare39() {
return spare39;
}
public void setSpare39(String spare39) {
this.spare39 = spare39;
}
public String getRemark() {
return remark;
}
public void setRemark(String remark) {
this.remark = remark;
}
public String getThePlatoon() {
return thePlatoon;
}
public void setThePlatoon(String thePlatoon) {
this.thePlatoon = thePlatoon;
}
public String getTheColumn() {
return theColumn;
}
public void setTheColumn(String theColumn) {
this.theColumn = theColumn;
}
public String getTheFloor() {
return theFloor;
}
public void setTheFloor(String theFloor) {
this.theFloor = theFloor;
}
public String getStartTime() {
return startTime;
}
public void setStartTime(String startTime) {
this.startTime = startTime;
}
public String getFinishTime() {
return finishTime;
}
public void setFinishTime(String finishTime) {
this.finishTime = finishTime;
}
}

657
ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockinHistory/domain/ViewStockinHistory.java
View File

@@ -343,5 +343,662 @@ public class ViewStockinHistory extends BaseEntity
// @Excel(name = "仓库名称")
private String warehouseName;
private String startTime;
private String finishTime;
public String getStockinGuid() {
return stockinGuid;
}
public void setStockinGuid(String stockinGuid) {
this.stockinGuid = stockinGuid;
}
public String getStockinId() {
return stockinId;
}
public void setStockinId(String stockinId) {
this.stockinId = stockinId;
}
public String getStockinDetailId() {
return stockinDetailId;
}
public void setStockinDetailId(String stockinDetailId) {
this.stockinDetailId = stockinDetailId;
}
public String getInType() {
return inType;
}
public void setInType(String inType) {
this.inType = inType;
}
public String getCreateDate() {
return createDate;
}
public void setCreateDate(String createDate) {
this.createDate = createDate;
}
public String getCreateManId() {
return createManId;
}
public void setCreateManId(String createManId) {
this.createManId = createManId;
}
public String getErpBill() {
return erpBill;
}
public void setErpBill(String erpBill) {
this.erpBill = erpBill;
}
public String getProductId() {
return productId;
}
public void setProductId(String productId) {
this.productId = productId;
}
public String getProductName() {
return productName;
}
public void setProductName(String productName) {
this.productName = productName;
}
public String getSupplierName() {
return supplierName;
}
public void setSupplierName(String supplierName) {
this.supplierName = supplierName;
}
public String getStatus() {
return status;
}
public void setStatus(String status) {
this.status = status;
}
public String getWarehouseId() {
return warehouseId;
}
public void setWarehouseId(String warehouseId) {
this.warehouseId = warehouseId;
}
public String getFinishDate() {
return finishDate;
}
public void setFinishDate(String finishDate) {
this.finishDate = finishDate;
}
public String getStockSource() {
return stockSource;
}
public void setStockSource(String stockSource) {
this.stockSource = stockSource;
}
public String getDepartmentNo() {
return departmentNo;
}
public void setDepartmentNo(String departmentNo) {
this.departmentNo = departmentNo;
}
public String getClassNo() {
return classNo;
}
public void setClassNo(String classNo) {
this.classNo = classNo;
}
public String getSupplierNo() {
return supplierNo;
}
public void setSupplierNo(String supplierNo) {
this.supplierNo = supplierNo;
}
public String getSimpleName() {
return simpleName;
}
public void setSimpleName(String simpleName) {
this.simpleName = simpleName;
}
public String getContactName() {
return contactName;
}
public void setContactName(String contactName) {
this.contactName = contactName;
}
public String getContactNumber() {
return contactNumber;
}
public void setContactNumber(String contactNumber) {
this.contactNumber = contactNumber;
}
public String getAddress() {
return address;
}
public void setAddress(String address) {
this.address = address;
}
public String getLotNo() {
return lotNo;
}
public void setLotNo(String lotNo) {
this.lotNo = lotNo;
}
public String getQuantity() {
return quantity;
}
public void setQuantity(String quantity) {
this.quantity = quantity;
}
public String getQuantityX() {
return quantityX;
}
public void setQuantityX(String quantityX) {
this.quantityX = quantityX;
}
public String getQuantityJ() {
return quantityJ;
}
public void setQuantityJ(String quantityJ) {
this.quantityJ = quantityJ;
}
public String getAssignNum() {
return assignNum;
}
public void setAssignNum(String assignNum) {
this.assignNum = assignNum;
}
public String getAssignNumX() {
return assignNumX;
}
public void setAssignNumX(String assignNumX) {
this.assignNumX = assignNumX;
}
public String getAssignNumJ() {
return assignNumJ;
}
public void setAssignNumJ(String assignNumJ) {
this.assignNumJ = assignNumJ;
}
public String getScanNum() {
return scanNum;
}
public void setScanNum(String scanNum) {
this.scanNum = scanNum;
}
public String getScanNumX() {
return scanNumX;
}
public void setScanNumX(String scanNumX) {
this.scanNumX = scanNumX;
}
public String getScanNumJ() {
return scanNumJ;
}
public void setScanNumJ(String scanNumJ) {
this.scanNumJ = scanNumJ;
}
public String getPrintDate() {
return printDate;
}
public void setPrintDate(String printDate) {
this.printDate = printDate;
}
public String getStockStatus() {
return stockStatus;
}
public void setStockStatus(String stockStatus) {
this.stockStatus = stockStatus;
}
public String getProductGuid() {
return productGuid;
}
public void setProductGuid(String productGuid) {
this.productGuid = productGuid;
}
public String getParentId() {
return parentId;
}
public void setParentId(String parentId) {
this.parentId = parentId;
}
public String getPrice() {
return price;
}
public void setPrice(String price) {
this.price = price;
}
public String getCargoNo() {
return cargoNo;
}
public void setCargoNo(String cargoNo) {
this.cargoNo = cargoNo;
}
public String getUnit() {
return unit;
}
public void setUnit(String unit) {
this.unit = unit;
}
public String getSpec() {
return spec;
}
public void setSpec(String spec) {
this.spec = spec;
}
public String getSpare1() {
return spare1;
}
public void setSpare1(String spare1) {
this.spare1 = spare1;
}
public String getSpare2() {
return spare2;
}
public void setSpare2(String spare2) {
this.spare2 = spare2;
}
public String getSpare3() {
return spare3;
}
public void setSpare3(String spare3) {
this.spare3 = spare3;
}
public String getSpare4() {
return spare4;
}
public void setSpare4(String spare4) {
this.spare4 = spare4;
}
public String getSpare5() {
return spare5;
}
public void setSpare5(String spare5) {
this.spare5 = spare5;
}
public String getSpare6() {
return spare6;
}
public void setSpare6(String spare6) {
this.spare6 = spare6;
}
public String getSpare7() {
return spare7;
}
public void setSpare7(String spare7) {
this.spare7 = spare7;
}
public String getSpare8() {
return spare8;
}
public void setSpare8(String spare8) {
this.spare8 = spare8;
}
public String getSpare9() {
return spare9;
}
public void setSpare9(String spare9) {
this.spare9 = spare9;
}
public String getSpare10() {
return spare10;
}
public void setSpare10(String spare10) {
this.spare10 = spare10;
}
public String getSpare11() {
return spare11;
}
public void setSpare11(String spare11) {
this.spare11 = spare11;
}
public String getSpare12() {
return spare12;
}
public void setSpare12(String spare12) {
this.spare12 = spare12;
}
public String getSpare13() {
return spare13;
}
public void setSpare13(String spare13) {
this.spare13 = spare13;
}
public String getSpare14() {
return spare14;
}
public void setSpare14(String spare14) {
this.spare14 = spare14;
}
public String getSpare15() {
return spare15;
}
public void setSpare15(String spare15) {
this.spare15 = spare15;
}
public String getSpare16() {
return spare16;
}
public void setSpare16(String spare16) {
this.spare16 = spare16;
}
public String getSpare17() {
return spare17;
}
public void setSpare17(String spare17) {
this.spare17 = spare17;
}
public String getSpare18() {
return spare18;
}
public void setSpare18(String spare18) {
this.spare18 = spare18;
}
public String getSpare19() {
return spare19;
}
public void setSpare19(String spare19) {
this.spare19 = spare19;
}
public String getSpare20() {
return spare20;
}
public void setSpare20(String spare20) {
this.spare20 = spare20;
}
public String getSpare21() {
return spare21;
}
public void setSpare21(String spare21) {
this.spare21 = spare21;
}
public String getSpare22() {
return spare22;
}
public void setSpare22(String spare22) {
this.spare22 = spare22;
}
public String getSpare23() {
return spare23;
}
public void setSpare23(String spare23) {
this.spare23 = spare23;
}
public String getSpare24() {
return spare24;
}
public void setSpare24(String spare24) {
this.spare24 = spare24;
}
public String getSpare25() {
return spare25;
}
public void setSpare25(String spare25) {
this.spare25 = spare25;
}
public String getSpare26() {
return spare26;
}
public void setSpare26(String spare26) {
this.spare26 = spare26;
}
public String getSpare27() {
return spare27;
}
public void setSpare27(String spare27) {
this.spare27 = spare27;
}
public String getSpare28() {
return spare28;
}
public void setSpare28(String spare28) {
this.spare28 = spare28;
}
public String getSpare29() {
return spare29;
}
public void setSpare29(String spare29) {
this.spare29 = spare29;
}
public String getSpare30() {
return spare30;
}
public void setSpare30(String spare30) {
this.spare30 = spare30;
}
public String getSpare31() {
return spare31;
}
public void setSpare31(String spare31) {
this.spare31 = spare31;
}
public String getSpare32() {
return spare32;
}
public void setSpare32(String spare32) {
this.spare32 = spare32;
}
public String getSpare33() {
return spare33;
}
public void setSpare33(String spare33) {
this.spare33 = spare33;
}
public String getSpare34() {
return spare34;
}
public void setSpare34(String spare34) {
this.spare34 = spare34;
}
public String getSpare35() {
return spare35;
}
public void setSpare35(String spare35) {
this.spare35 = spare35;
}
public String getSpare36() {
return spare36;
}
public void setSpare36(String spare36) {
this.spare36 = spare36;
}
public String getSpare37() {
return spare37;
}
public void setSpare37(String spare37) {
this.spare37 = spare37;
}
public String getSpare38() {
return spare38;
}
public void setSpare38(String spare38) {
this.spare38 = spare38;
}
public String getSpare39() {
return spare39;
}
public void setSpare39(String spare39) {
this.spare39 = spare39;
}
public String getRemark() {
return remark;
}
public void setRemark(String remark) {
this.remark = remark;
}
public String getWarehouseName() {
return warehouseName;
}
public void setWarehouseName(String warehouseName) {
this.warehouseName = warehouseName;
}
public String getStartTime() {
return startTime;
}
public void setStartTime(String startTime) {
this.startTime = startTime;
}
public String getFinishTime() {
return finishTime;
}
public void setFinishTime(String finishTime) {
this.finishTime = finishTime;
}
}

529
ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockoutHistory/domain/ViewStockoutHistory.java
View File

@@ -284,5 +284,534 @@ public class ViewStockoutHistory extends BaseEntity
@Excel(name = "描述")
private String remark;
private String startTime;
private String finishTime;
public String getStockoutId() {
return stockoutId;
}
public void setStockoutId(String stockoutId) {
this.stockoutId = stockoutId;
}
public String getStockoutDetailId() {
return stockoutDetailId;
}
public void setStockoutDetailId(String stockoutDetailId) {
this.stockoutDetailId = stockoutDetailId;
}
public String getOutType() {
return outType;
}
public void setOutType(String outType) {
this.outType = outType;
}
public String getCreateDate() {
return createDate;
}
public void setCreateDate(String createDate) {
this.createDate = createDate;
}
public String getCreateManId() {
return createManId;
}
public void setCreateManId(String createManId) {
this.createManId = createManId;
}
public String getErpStockoutId() {
return erpStockoutId;
}
public void setErpStockoutId(String erpStockoutId) {
this.erpStockoutId = erpStockoutId;
}
public String getProductId() {
return productId;
}
public void setProductId(String productId) {
this.productId = productId;
}
public String getProductName() {
return productName;
}
public void setProductName(String productName) {
this.productName = productName;
}
public String getExitId() {
return exitId;
}
public void setExitId(String exitId) {
this.exitId = exitId;
}
public String getStatus() {
return status;
}
public void setStatus(String status) {
this.status = status;
}
public BigDecimal getQuantity() {
return quantity;
}
public void setQuantity(BigDecimal quantity) {
this.quantity = quantity;
}
public BigDecimal getAllotQuantity() {
return allotQuantity;
}
public void setAllotQuantity(BigDecimal allotQuantity) {
this.allotQuantity = allotQuantity;
}
public String getLotNo() {
return lotNo;
}
public void setLotNo(String lotNo) {
this.lotNo = lotNo;
}
public String getStockoutSource() {
return stockoutSource;
}
public void setStockoutSource(String stockoutSource) {
this.stockoutSource = stockoutSource;
}
public String getWarehouseId() {
return warehouseId;
}
public void setWarehouseId(String warehouseId) {
this.warehouseId = warehouseId;
}
public BigDecimal getAssignNum() {
return assignNum;
}
public void setAssignNum(BigDecimal assignNum) {
this.assignNum = assignNum;
}
public String getEntryid() {
return entryid;
}
public void setEntryid(String entryid) {
this.entryid = entryid;
}
public String getCustomerName() {
return customerName;
}
public void setCustomerName(String customerName) {
this.customerName = customerName;
}
public String getProductGuid() {
return productGuid;
}
public void setProductGuid(String productGuid) {
this.productGuid = productGuid;
}
public String getParentId() {
return parentId;
}
public void setParentId(String parentId) {
this.parentId = parentId;
}
public String getPrice() {
return price;
}
public void setPrice(String price) {
this.price = price;
}
public String getCargoNo() {
return cargoNo;
}
public void setCargoNo(String cargoNo) {
this.cargoNo = cargoNo;
}
public String getUnit() {
return unit;
}
public void setUnit(String unit) {
this.unit = unit;
}
public String getSpec() {
return spec;
}
public void setSpec(String spec) {
this.spec = spec;
}
public String getSpare1() {
return spare1;
}
public void setSpare1(String spare1) {
this.spare1 = spare1;
}
public String getSpare2() {
return spare2;
}
public void setSpare2(String spare2) {
this.spare2 = spare2;
}
public String getSpare3() {
return spare3;
}
public void setSpare3(String spare3) {
this.spare3 = spare3;
}
public String getSpare4() {
return spare4;
}
public void setSpare4(String spare4) {
this.spare4 = spare4;
}
public String getSpare5() {
return spare5;
}
public void setSpare5(String spare5) {
this.spare5 = spare5;
}
public String getSpare6() {
return spare6;
}
public void setSpare6(String spare6) {
this.spare6 = spare6;
}
public String getSpare7() {
return spare7;
}
public void setSpare7(String spare7) {
this.spare7 = spare7;
}
public String getSpare8() {
return spare8;
}
public void setSpare8(String spare8) {
this.spare8 = spare8;
}
public String getSpare9() {
return spare9;
}
public void setSpare9(String spare9) {
this.spare9 = spare9;
}
public String getSpare10() {
return spare10;
}
public void setSpare10(String spare10) {
this.spare10 = spare10;
}
public String getSpare11() {
return spare11;
}
public void setSpare11(String spare11) {
this.spare11 = spare11;
}
public String getSpare12() {
return spare12;
}
public void setSpare12(String spare12) {
this.spare12 = spare12;
}
public String getSpare13() {
return spare13;
}
public void setSpare13(String spare13) {
this.spare13 = spare13;
}
public String getSpare14() {
return spare14;
}
public void setSpare14(String spare14) {
this.spare14 = spare14;
}
public String getSpare15() {
return spare15;
}
public void setSpare15(String spare15) {
this.spare15 = spare15;
}
public String getSpare16() {
return spare16;
}
public void setSpare16(String spare16) {
this.spare16 = spare16;
}
public String getSpare17() {
return spare17;
}
public void setSpare17(String spare17) {
this.spare17 = spare17;
}
public String getSpare18() {
return spare18;
}
public void setSpare18(String spare18) {
this.spare18 = spare18;
}
public String getSpare19() {
return spare19;
}
public void setSpare19(String spare19) {
this.spare19 = spare19;
}
public String getSpare20() {
return spare20;
}
public void setSpare20(String spare20) {
this.spare20 = spare20;
}
public String getSpare21() {
return spare21;
}
public void setSpare21(String spare21) {
this.spare21 = spare21;
}
public String getSpare22() {
return spare22;
}
public void setSpare22(String spare22) {
this.spare22 = spare22;
}
public String getSpare23() {
return spare23;
}
public void setSpare23(String spare23) {
this.spare23 = spare23;
}
public String getSpare24() {
return spare24;
}
public void setSpare24(String spare24) {
this.spare24 = spare24;
}
public String getSpare25() {
return spare25;
}
public void setSpare25(String spare25) {
this.spare25 = spare25;
}
public String getSpare26() {
return spare26;
}
public void setSpare26(String spare26) {
this.spare26 = spare26;
}
public String getSpare27() {
return spare27;
}
public void setSpare27(String spare27) {
this.spare27 = spare27;
}
public String getSpare28() {
return spare28;
}
public void setSpare28(String spare28) {
this.spare28 = spare28;
}
public String getSpare29() {
return spare29;
}
public void setSpare29(String spare29) {
this.spare29 = spare29;
}
public String getSpare30() {
return spare30;
}
public void setSpare30(String spare30) {
this.spare30 = spare30;
}
public String getSpare31() {
return spare31;
}
public void setSpare31(String spare31) {
this.spare31 = spare31;
}
public String getSpare32() {
return spare32;
}
public void setSpare32(String spare32) {
this.spare32 = spare32;
}
public String getSpare33() {
return spare33;
}
public void setSpare33(String spare33) {
this.spare33 = spare33;
}
public String getSpare34() {
return spare34;
}
public void setSpare34(String spare34) {
this.spare34 = spare34;
}
public String getSpare35() {
return spare35;
}
public void setSpare35(String spare35) {
this.spare35 = spare35;
}
public String getSpare36() {
return spare36;
}
public void setSpare36(String spare36) {
this.spare36 = spare36;
}
public String getSpare37() {
return spare37;
}
public void setSpare37(String spare37) {
this.spare37 = spare37;
}
public String getSpare38() {
return spare38;
}
public void setSpare38(String spare38) {
this.spare38 = spare38;
}
public String getSpare39() {
return spare39;
}
public void setSpare39(String spare39) {
this.spare39 = spare39;
}
public String getRemark() {
return remark;
}
public void setRemark(String remark) {
this.remark = remark;
}
public String getStartTime() {
return startTime;
}
public void setStartTime(String startTime) {
this.startTime = startTime;
}
public String getFinishTime() {
return finishTime;
}
public void setFinishTime(String finishTime) {
this.finishTime = finishTime;
}
}

16
ruoyi-admin/src/main/resources/mapper/out/ViewHandAllotStockMapper.xml
View File

@@ -42,6 +42,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="spare7" column="spare7" />
<result property="spare8" column="spare8" />
<result property="cargoSpaceName" column="cargo_space_name" />
<result property="roadwayId" column="roadway_id" />
<result property="thePlatoon" column="the_platoon" />
<result property="theColumn" column="the_column" />
<result property="theFloor" column="the_floor" />
<result property="status" column="status" />
<result property="locked" column="locked" />
</resultMap>
<sql id="selectViewHandAllotStockVo">
@@ -49,7 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
quantity, job_id, tray_code, out_quantity, stockin_detail_id, stockin_id, in_type, in_class_id,
warehouse_id, stacking_id, spare1, spare2, spare3, spare4, spare5, spare6, product_id, product_name,
voltage, power, phase, net_weight, gross_weight, distribution, model, order_id, spare7, spare8,
cargo_space_name from view_hand_allot_stock
cargo_space_name,roadway_id,the_platoon,the_column,the_floor,status,locked from view_hand_allot_stock
</sql>
<select id="selectViewHandAllotStockList" parameterType="ViewHandAllotStock" resultMap="ViewHandAllotStockResult">
@@ -92,9 +98,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="orderId != null and orderId != ''"> and order_id like concat('%', #{orderId}, '%')</if>
<if test="spare7 != null and spare7 != ''"> and spare7 = #{spare7}</if>
<if test="spare8 != null and spare8 != ''"> and spare8 = #{spare8}</if>
<if test="thePlatoon != null and thePlatoon != ''"> and cargo_space_id in (select cargo_space_id from bas_cargo_space where the_platoon=#{thePlatoon})</if>
<if test="theColumn != null and theColumn != ''"> and cargo_space_id in (select cargo_space_id from bas_cargo_space where the_column=#{theColumn})</if>
<if test="theFloor != null and theFloor != ''"> and cargo_space_id in (select cargo_space_id from bas_cargo_space where the_floor=#{theFloor})</if>
<if test="thePlatoon != null and thePlatoon != ''"> and the_platoon=#{thePlatoon}</if>
<if test="theColumn != null and theColumn != ''"> and the_column=#{theColumn}</if>
<if test="theFloor != null and theFloor != ''"> and the_floor=#{theFloor}</if>
<if test="roadwayId != null and roadwayId != ''"> and roadway_id=#{roadwayId}</if>
<if test="locked != null and locked != ''"> and locked=#{locked}</if>
</where>
</select>

26
ruoyi-admin/src/main/resources/mapper/search/ViewInJobFlowMapper.xml
View File

@@ -83,7 +83,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectViewInJobFlowVo">
select job_id, job_detail_id,line_id, status, task_no, tray_code, roadway_id, cargo_space_id, cargo_space_name, the_platoon, the_column, the_floor, priority, execution_phase, in_or_out, entrance_id, wlbh, lot_no, stacking_id, stock_status, in_quantity, in_or_out_id, in_or_out_d_id, create_time, start_time, finish_time, warehouse_id, product_guid, product_id, parent_id, price, cargo_no, unit, spec, remark, spare1, spare2, spare3, spare4, spare5, spare6, product_name, spare7, spare8, spare9, spare10, spare11, spare12, spare13, spare14, spare15, spare16, spare17, spare18, spare19, spare20, spare21, spare22, spare23, spare24, spare25, spare26, spare27, spare28, spare29, spare30, spare31, spare32, spare33, spare34, spare35, spare36, spare37, spare38, spare39 from view_in_job_flow
select job_id, job_detail_id,line_id, status, task_no, tray_code, roadway_id, cargo_space_id,
cargo_space_name, the_platoon, the_column, the_floor, priority, execution_phase, in_or_out,
entrance_id, wlbh, lot_no, stacking_id, stock_status, in_quantity, in_or_out_id, in_or_out_d_id,
create_time, start_time, finish_time, warehouse_id, product_guid, product_id, parent_id, price,
cargo_no, unit, spec, remark, spare1, spare2, spare3, spare4, spare5, spare6, product_name, spare7,
spare8, spare9, spare10, spare11, spare12, spare13, spare14, spare15, spare16, spare17, spare18,
spare19, spare20, spare21, spare22, spare23, spare24, spare25, spare26, spare27, spare28, spare29,
spare30, spare31, spare32, spare33, spare34, spare35, spare36, spare37, spare38, spare39
from view_in_job_flow
</sql>
<select id="selectViewInJobFlowList" parameterType="ViewInJobFlow" resultMap="ViewInJobFlowResult">
@@ -92,17 +100,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="jobId != null and jobId != ''"> and job_id like concat('%', #{jobId}, '%')</if>
<if test="jobDetailId != null and jobDetailId != ''"> and job_detail_id like concat('%', #{jobDetailId}, '%')</if>
<if test="status != null and status != ''"> and status = #{status}</if>
<if test="taskNo != null and taskNo != ''"> and task_no like concat('%', #{taskNo}, '%')</if>
<if test="taskNo != null and taskNo != ''"> and task_no = #{taskNo}</if>
<if test="trayCode != null and trayCode != ''"> and tray_code like concat('%', #{trayCode}, '%')</if>
<if test="roadwayId != null and roadwayId != ''"> and roadway_id like concat('%', #{roadwayId}, '%')</if>
<if test="roadwayId != null and roadwayId != ''"> and roadway_id = #{roadwayId}</if>
<if test="cargoSpaceId != null and cargoSpaceId != ''"> and cargo_space_id like concat('%', #{cargoSpaceId}, '%')</if>
<if test="cargoSpaceName != null and cargoSpaceName != ''"> and cargo_space_name like concat('%', #{cargoSpaceName}, '%')</if>
<if test="thePlatoon != null "> and the_platoon like concat('%', #{thePlatoon}, '%')</if>
<if test="theColumn != null "> and the_column like concat('%', #{theColumn}, '%')</if>
<if test="theFloor != null "> and the_floor like concat('%', #{theFloor}, '%')</if>
<if test="thePlatoon != null "> and the_platoon = #{thePlatoon}</if>
<if test="theColumn != null "> and the_column = #{theColumn}</if>
<if test="theFloor != null "> and the_floor = #{theFloor}</if>
<if test="priority != null "> and priority like concat('%', #{priority}, '%')</if>
<if test="executionPhase != null and executionPhase != ''"> and execution_phase = #{executionPhase}</if>
<if test="inOrOut != null and inOrOut != ''"> and in_or_out like concat('%', #{inOrOut}, '%')</if>
<if test="inOrOut != null and inOrOut != ''"> and in_or_out = #{inOrOut}</if>
<if test="entranceId != null and entranceId != ''"> and entrance_id like concat('%', #{entranceId}, '%')</if>
<if test="wlbh != null and wlbh != ''"> and wlbh like concat('%', #{wlbh}, '%')</if>
<if test="lotNo != null and lotNo != ''"> and lot_no like concat('%', #{lotNo}, '%')</if>
@@ -112,8 +120,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="inOrOutId != null and inOrOutId != ''"> and in_or_out_id like concat('%', #{inOrOutId}, '%')</if>
<if test="inOrOutDId != null and inOrOutDId != ''"> and in_or_out_d_id like concat('%', #{inOrOutDId}, '%')</if>
<if test="createTime != null and createTime != ''"> and create_time like concat('%', #{createTime}, '%')</if>
<if test="startTime != null and startTime != ''"> and start_time like concat('%', #{startTime}, '%')</if>
<if test="finishTime != null and finishTime != ''"> and finish_time like concat('%', #{finishTime}, '%')</if>
<if test="startTime != null and startTime != ''"> and create_time &gt;= #{startTime}</if>
<if test="finishTime != null and finishTime != ''"> and create_time &lt;= #{finishTime}</if>
<if test="warehouseId != null and warehouseId != ''"> and warehouse_id like concat('%', #{warehouseId}, '%')</if>
<if test="productGuid != null and productGuid != ''"> and product_guid like concat('%', #{productGuid}, '%')</if>
<if test="productId != null and productId != ''"> and product_id like concat('%', #{productId}, '%')</if>

57
ruoyi-admin/src/main/resources/mapper/search/ViewStockDetailMapper.xml
View File

@@ -39,46 +39,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectViewStockDetailVo">
SELECT
ROW_NUMBER() OVER (ORDER BY s.stock_id ASC) AS only_identity,
s.stock_id,
s.cargo_space_id,
s.tray_code,
s.quantity,
s.job_id,
s.lot_no,
s.stockin_detail_id,
s.in_date,
s.warehouse_id,
s.stacking_id,
s.order_id,
cs.cargo_space_name,
cs.roadway_id,
cs.status AS cargo_space_status,
s.stock_status AS stock_status,
s.product_status AS product_status,
cs.locked,
p.product_guid,
p.product_id,
p.product_name,
p.spec,
p.unit,
p.price,
p.spare1,
p.spare2,
p.spare5,
p.spare6,
p.spare7,
p.spare8,
p.remark,
bw.warehouse_name
FROM
bas_stock s
LEFT JOIN bas_cargo_space cs ON cs.cargo_space_id = s.cargo_space_id
LEFT JOIN bas_product p ON p.product_guid = s.product_guid
LEFT JOIN bas_warehouse bw on s.warehouse_id = bw.warehouse_id
WHERE
cs.status = '2'
SELECT ROW_NUMBER() OVER (ORDER BY s.stock_id ASC) AS only_identity, s.stock_id,s.cargo_space_id,s.tray_code,
s.quantity,s.job_id, s.lot_no,s.stockin_detail_id,s.in_date,s.warehouse_id,s.stacking_id,s.order_id,cs.cargo_space_name,
cs.roadway_id,cs.status AS cargo_space_status,s.stock_status AS stock_status,s.product_status AS product_status,
cs.locked,p.product_guid,p.product_id,p.product_name,p.spec,p.unit,p.price,p.spare1,p.spare2,p.spare5,p.spare6,
p.spare7,p.spare8,p.remark,bw.warehouse_name
FROM bas_stock s
LEFT JOIN bas_cargo_space cs ON cs.cargo_space_id = s.cargo_space_id
LEFT JOIN bas_product p ON p.product_guid = s.product_guid
LEFT JOIN bas_warehouse bw on s.warehouse_id = bw.warehouse_id
WHERE cs.status = '2'
</sql>
<select id="selectViewStockDetailList" parameterType="ViewStockDetail" resultMap="ViewStockDetailResult">
@@ -88,7 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="trayCode != null and trayCode != ''"> and s.tray_code like concat('%',#{trayCode}, '%')</if>
<if test="quantity != null and quantity != ''"> and s.quantity = #{quantity}</if>
<if test="jobId != null and jobId != ''"> and s.job_id = #{jobId}</if>
<if test="lotNo != null and lotNo != ''"> and s.lot_no = #{lotNo}</if>
<if test="lotNo != null and lotNo != ''"> and s.lot_no like concat('%',#{lotNo}, '%')</if>
<if test="stockinDetailId != null and stockinDetailId != ''"> and s.stockin_detail_id = #{stockinDetailId}</if>
<if test="inDate != null and inDate != ''"> and s.in_date = #{inDate}</if>
<if test="warehouseId != null and warehouseId != ''"> and s.warehouse_id = #{warehouseId}</if>
@@ -113,6 +83,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="spare8 != null and spare8 != ''"> and p.spare8 = #{spare8}</if>
<if test="remark != null and remark != ''"> and p.remark = #{remark}</if>
<if test="orderId != null and orderId != ''"> and s.order_id like concat('%',#{orderId}, '%')</if>
<if test="thePlatoon != null and thePlatoon != ''"> and cs.the_platoon = #{thePlatoon}</if>
<if test="theColumn != null and theColumn != ''"> and cs.the_column = #{theColumn}</if>
<if test="theFloor != null and theFloor != ''"> and cs.the_floor = #{theFloor}</if>
<if test="startTime != null and startTime != ''"> and s.in_date &gt;= #{startTime}</if>
<if test="finishTime != null and finishTime != ''"> and s.in_date &lt;= #{finishTime}</if>
</select>
<select id="selectViewStockDetailByOnlyIdentity" parameterType="Long" resultMap="ViewStockDetailResult">

12
ruoyi-admin/src/main/resources/mapper/search/ViewStockinHistoryMapper.xml
View File

@@ -88,7 +88,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectViewStockinHistoryVo">
select stockin_guid, stockin_id, in_type, create_date, create_man_id, status, warehouse_id, finish_date, erp_bill, stock_source, department_no, class_no, supplier_no, supplier_name, simple_name, contact_name, contact_number, address, stockin_detail_id, lot_no, quantity, quantity_x, quantity_j, assign_num, assign_num_x, assign_num_j, scan_num, scan_num_x, scan_num_j, print_date, stock_status, product_guid, product_id, parent_id, price, cargo_no, unit, spec, remark, spare1, spare2, spare3, spare4, spare5, spare6, product_name, spare7, spare8, spare9, spare10, spare11, spare12, spare13, spare14, spare15, spare16, spare17, spare18, spare19, spare20, spare21, spare22, spare23, spare24, spare25, spare26, spare27, spare28, spare29, spare30, spare31, spare32, spare33, spare34, spare35, spare36, spare37, spare38, spare39, warehouse_name from view_stockin_history
select stockin_guid, stockin_id, in_type, create_date, create_man_id, status, warehouse_id, finish_date,
erp_bill, stock_source, department_no, class_no, supplier_no, supplier_name, simple_name, contact_name,
contact_number, address, stockin_detail_id, lot_no, quantity, quantity_x, quantity_j, assign_num,
assign_num_x, assign_num_j, scan_num, scan_num_x, scan_num_j, print_date, stock_status, product_guid,
product_id, parent_id, price, cargo_no, unit, spec, remark, spare1, spare2, spare3, spare4, spare5,
spare6, product_name, spare7, spare8, spare9, spare10, spare11, spare12, spare13, spare14, spare15,
spare16, spare17, spare18, spare19, spare20, spare21, spare22, spare23, spare24, spare25, spare26,
spare27, spare28, spare29, spare30, spare31, spare32, spare33, spare34, spare35, spare36, spare37,
spare38, spare39, warehouse_name from view_stockin_history
</sql>
<select id="selectViewStockinHistoryList" parameterType="ViewStockinHistory" resultMap="ViewStockinHistoryResult">
@@ -98,6 +106,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="stockinId != null and stockinId != ''"> and stockin_id like concat('%', #{stockinId}, '%')</if>
<if test="inType != null and inType != ''"> and in_type = #{inType}</if>
<if test="createDate != null and createDate != ''"> and create_date like concat('%', #{createDate}, '%')</if>
<if test="startTime != null and startTime != ''"> and create_date &gt;= #{startTime}</if>
<if test="finishTime != null and finishTime != ''"> and create_date &lt;= #{startTime}</if>
<if test="createManId != null and createManId != ''"> and create_man_id like concat('%', #{createManId}, '%')</if>
<if test="status != null and status != ''"> and status = #{status}</if>
<if test="warehouseId != null and warehouseId != ''"> and warehouse_id like concat('%', #{warehouseId}, '%')</if>

10
ruoyi-admin/src/main/resources/mapper/search/ViewStockoutHistoryMapper.xml
View File

@@ -72,7 +72,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectViewStockoutHistoryVo">
select stockout_id, out_type, create_date, create_man_id, status, stockout_source, exit_id, warehouse_id, stockout_detail_id, lot_no, quantity, allot_quantity, assign_num, erp_stockout_id, entryid, customer_name, product_guid, product_id, parent_id, price, cargo_no, unit, spec, remark, spare1, spare2, spare3, spare4, spare5, spare6, product_name, spare7, spare8, spare9, spare10, spare11, spare12, spare13, spare14, spare15, spare16, spare17, spare18, spare19, spare20, spare21, spare22, spare23, spare24, spare25, spare26, spare27, spare28, spare29, spare30, spare31, spare32, spare33, spare34, spare35, spare36, spare37, spare38, spare39 from view_stockout_history
select stockout_id, out_type, create_date, create_man_id, status, stockout_source, exit_id, warehouse_id,
stockout_detail_id, lot_no, quantity, allot_quantity, assign_num, erp_stockout_id, entryid, customer_name,
product_guid, product_id, parent_id, price, cargo_no, unit, spec, remark, spare1, spare2, spare3, spare4,
spare5, spare6, product_name, spare7, spare8, spare9, spare10, spare11, spare12, spare13, spare14, spare15,
spare16, spare17, spare18, spare19, spare20, spare21, spare22, spare23, spare24, spare25, spare26, spare27,
spare28, spare29, spare30, spare31, spare32, spare33, spare34, spare35, spare36, spare37, spare38, spare39
from view_stockout_history
</sql>
<select id="selectViewStockoutHistoryList" parameterType="ViewStockoutHistory" resultMap="ViewStockoutHistoryResult">
@@ -81,6 +87,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="stockoutId != null and stockoutId != ''"> and stockout_id like concat('%', #{stockoutId}, '%')</if>
<if test="outType != null and outType != ''"> and out_type = #{outType}</if>
<if test="createDate != null and createDate != ''"> and create_date like concat('%', #{createDate}, '%')</if>
<if test="startTime != null and startTime != ''"> and create_date &gt;= #{startTime}</if>
<if test="finishTime != null and finishTime != ''"> and create_date &lt;= #{finishTime}</if>
<if test="createManId != null and createManId != ''"> and create_man_id like concat('%', #{createManId}, '%')</if>
<if test="status != null and status != ''"> and status = #{status}</if>
<if test="stockoutSource != null and stockoutSource != ''"> and stockout_source like concat('%', #{stockoutSource}, '%')</if>