liyuqi/ry_wms
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化实体类的getter和setter, 以及调整代码块格式

Browse Source
This commit is contained in:
李宇奇 2026-03-09 16:04:40 +08:00
parent 4630a448ed
commit 82e3d665df
6 changed files with 272 additions and 1372 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

700
zbf-system/src/main/java/com/zbf/system/domain/TOngoodsshelf.java
View File

@ -5,6 +5,8 @@ import java.util.Date;
import java.util.List; import java.util.List;
import lombok.Data; import lombok.Data;
import lombok.Getter;
import lombok.Setter;
import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.commons.lang3.builder.ToStringStyle;
@ -21,6 +23,8 @@ import com.zbf.common.core.domain.BaseEntity;
* @date 2024-06-14 * @date 2024-06-14
*/ */
@Data @Data
@Setter
@Getter
@TableName(resultMap = "com.zbf.system.mapper.TOngoodsshelfMapper.TOngoodsshelfResult") @TableName(resultMap = "com.zbf.system.mapper.TOngoodsshelfMapper.TOngoodsshelfResult")
public class TOngoodsshelf extends BaseEntity { public class TOngoodsshelf extends BaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ -350,708 +354,12 @@ public class TOngoodsshelf extends BaseEntity {
private String rfidEpc; private String rfidEpc;
public String getRfidTid() {
return rfidTid;
}
public void setRfidTid(String rfidTid) {
this.rfidTid = rfidTid;
}
public String getRfidEpc() {
return rfidEpc;
}
public void setRfidEpc(String rfidEpc) {
this.rfidEpc = rfidEpc;
}
public String getStorageShortName() {
return storageShortName;
}
public void setStorageShortName(String storageShortName) {
this.storageShortName = storageShortName;
}
/** 暂存收货库位 */ /** 暂存收货库位 */
private String virtuallyLocation; private String virtuallyLocation;
/**任务通知ID */ /**任务通知ID */
private String callNoticeId; private String callNoticeId;
public String getCallNoticeId() {
return callNoticeId;
}
public void setCallNoticeId(String callNoticeId) {
this.callNoticeId = callNoticeId;
}
public String getVirtuallyLocation() {
return virtuallyLocation;
}
public void setVirtuallyLocation(String virtuallyLocation) {
this.virtuallyLocation = virtuallyLocation;
}
public String getAbc() {
return abc;
}
public void setAbc(String abc) {
this.abc = abc;
}
public String getLevelType() {
return levelType;
}
public void setLevelType(String levelType) {
this.levelType = levelType;
}
public List<String> getStorageList() {
return storageList;
}
public void setStorageList(List<String> storageList) {
this.storageList = storageList;
}
public Long getDeptId() {
return deptId;
}
public void setDeptId(Long deptId) {
this.deptId = deptId;
}
public String getSalesOrderNumber() {
return salesOrderNumber;
}
public void setSalesOrderNumber(String salesOrderNumber) {
this.salesOrderNumber = salesOrderNumber;
}
public void setId(String id) {
this.id = id;
}
public String getNeedPerson() {
return needPerson;
}
public void setNeedPerson(String needPerson) {
this.needPerson = needPerson;
}
public String getNeedTel() {
return needTel;
}
public void setNeedTel(String needTel) {
this.needTel = needTel;
}
public String getId() {
return id;
}
public void setLotId(String lotId) {
this.lotId = lotId;
}
public String getLotId() {
return lotId;
}
public void setGoodsId(String goodsId) {
this.goodsId = goodsId;
}
public String getGoodsId() {
return goodsId;
}
public void setProviderId(String providerId) {
this.providerId = providerId;
}
public String getProviderId() {
return providerId;
}
public void setLocationId(String locationId) {
this.locationId = locationId;
}
public String getLocationId() {
return locationId;
}
public void setStoNum(BigDecimal stoNum) {
this.stoNum = stoNum;
}
public BigDecimal getStoNum() {
return stoNum;
}
public void setCtl(String ctl) {
this.ctl = ctl;
}
public String getCtl() {
return ctl;
}
public void setRecoil(String recoil) {
this.recoil = recoil;
}
public String getRecoil() {
return recoil;
}
public void setAccNum(BigDecimal accNum) {
this.accNum = accNum;
}
public BigDecimal getAccNum() {
return accNum;
}
public void setStockNum(BigDecimal stockNum) {
this.stockNum = stockNum;
}
public BigDecimal getStockNum() {
return stockNum;
}
public void setOndate(String ondate) {
this.ondate = ondate;
}
public String getOndate() {
return ondate;
}
public void setReceiver(String receiver) {
this.receiver = receiver;
}
public String getReceiver() {
return receiver;
}
public void setStorageId(String storageId) {
this.storageId = storageId;
}
public String getStorageId() {
return storageId;
}
public void setStorageAreaId(String storageAreaId) {
this.storageAreaId = storageAreaId;
}
public String getStorageAreaId() {
return storageAreaId;
}
public void setOperatorId(String operatorId) {
this.operatorId = operatorId;
}
public String getOperatorId() {
return operatorId;
}
public void setStorageMode(String storageMode) {
this.storageMode = storageMode;
}
public String getStorageMode() {
return storageMode;
}
public void setGoodsVolume(BigDecimal goodsVolume) {
this.goodsVolume = goodsVolume;
}
public BigDecimal getGoodsVolume() {
return goodsVolume;
}
public void setBarcode(String barcode) {
this.barcode = barcode;
}
public String getBarcode() {
return barcode;
}
public void setCustomerId(String customerId) {
this.customerId = customerId;
}
public String getCustomerId() {
return customerId;
}
public void setNeedDept(String needDept) {
this.needDept = needDept;
}
public String getNeedDept() {
return needDept;
}
public void setProduclotId(String produclotId) {
this.produclotId = produclotId;
}
public String getProduclotId() {
return produclotId;
}
public void setUnit(String unit) {
this.unit = unit;
}
public String getUnit() {
return unit;
}
public void setRespDept(String respDept) {
this.respDept = respDept;
}
public String getRespDept() {
return respDept;
}
public void setPlcId(Long plcId) {
this.plcId = plcId;
}
public Long getPlcId() {
return plcId;
}
public void setSupplier(String supplier) {
this.supplier = supplier;
}
public String getSupplier() {
return supplier;
}
public void setGoodsName(String goodsName) {
this.goodsName = goodsName;
}
public String getGoodsName() {
return goodsName;
}
public void setInstand(String instand) {
this.instand = instand;
}
public String getInstand() {
return instand;
}
public void setBrand(String brand) {
this.brand = brand;
}
public String getBrand() {
return brand;
}
public void setTaskType(String taskType) {
this.taskType = taskType;
}
public String getTaskType() {
return taskType;
}
public void setApplicant(String applicant) {
this.applicant = applicant;
}
public String getApplicant() {
return applicant;
}
public void setPackingNum(BigDecimal packingNum) {
this.packingNum = packingNum;
}
public BigDecimal getPackingNum() {
return packingNum;
}
public void setDamageNum(BigDecimal damageNum) {
this.damageNum = damageNum;
}
public BigDecimal getDamageNum() {
return damageNum;
}
public void setPurchaseDept(String purchaseDept) {
this.purchaseDept = purchaseDept;
}
public String getPurchaseDept() {
return purchaseDept;
}
public void setPrice(BigDecimal price) {
this.price = price;
}
public BigDecimal getPrice() {
return price;
}
public void setScaleUnit(String scaleUnit) {
this.scaleUnit = scaleUnit;
}
public String getScaleUnit() {
return scaleUnit;
}
public void setTotalVolume(BigDecimal totalVolume) {
this.totalVolume = totalVolume;
}
public BigDecimal getTotalVolume() {
return totalVolume;
}
public void setTotalRoughWeight(BigDecimal totalRoughWeight) {
this.totalRoughWeight = totalRoughWeight;
}
public BigDecimal getTotalRoughWeight() {
return totalRoughWeight;
}
public void setTotalNetWeigh(BigDecimal totalNetWeigh) {
this.totalNetWeigh = totalNetWeigh;
}
public BigDecimal getTotalNetWeigh() {
return totalNetWeigh;
}
public void setTotalMoney(BigDecimal totalMoney) {
this.totalMoney = totalMoney;
}
public BigDecimal getTotalMoney() {
return totalMoney;
}
public void setAcceId(String acceId) {
this.acceId = acceId;
}
public String getAcceId() {
return acceId;
}
public void setInStatus(String inStatus) {
this.inStatus = inStatus;
}
public String getInStatus() {
return inStatus;
}
public void setFlag(String flag) {
this.flag = flag;
}
public String getFlag() {
return flag;
}
public void setStandard(String standard) {
this.standard = standard;
}
public String getStandard() {
return standard;
}
public void setInnerBatchNo(String innerBatchNo) {
this.innerBatchNo = innerBatchNo;
}
public String getInnerBatchNo() {
return innerBatchNo;
}
public void setPrintCs(BigDecimal printCs) {
this.printCs = printCs;
}
public BigDecimal getPrintCs() {
return printCs;
}
public void setPrintSts(String printSts) {
this.printSts = printSts;
}
public String getPrintSts() {
return printSts;
}
public void setPurchaseType(BigDecimal purchaseType) {
this.purchaseType = purchaseType;
}
public BigDecimal getPurchaseType() {
return purchaseType;
}
public void setManualTrayState(String manualTrayState) {
this.manualTrayState = manualTrayState;
}
public String getManualTrayState() {
return manualTrayState;
}
public void setSpec(String spec) {
this.spec = spec;
}
public String getSpec() {
return spec;
}
public void setWmsOrderId(String wmsOrderId) {
this.wmsOrderId = wmsOrderId;
}
public String getWmsOrderId() {
return wmsOrderId;
}
public void setBatchNo(String batchNo) {
this.batchNo = batchNo;
}
public String getBatchNo() {
return batchNo;
}
public void setDamageLocation(String damageLocation) {
this.damageLocation = damageLocation;
}
public String getDamageLocation() {
return damageLocation;
}
public void setStatus(String status) {
this.status = status;
}
public String getStatus() {
return status;
}
public void setSpecification(String specification) {
this.specification = specification;
}
public String getSpecification() {
return specification;
}
public void setGoodsTypeId(String goodsTypeId) {
this.goodsTypeId = goodsTypeId;
}
public String getGoodsTypeId() {
return goodsTypeId;
}
public void setOperateDate(Date operateDate) {
this.operateDate = operateDate;
}
public Date getOperateDate() {
return operateDate;
}
public void setPlanDate(String planDate) {
this.planDate = planDate;
}
public String getPlanDate() {
return planDate;
}
public void setPlanTime(String planTime) {
this.planTime = planTime;
}
public String getPlanTime() {
return planTime;
}
public void setNeedCycle(BigDecimal needCycle) {
this.needCycle = needCycle;
}
public BigDecimal getNeedCycle() {
return needCycle;
}
public void setNeedType(String needType) {
this.needType = needType;
}
public String getNeedType() {
return needType;
}
public void setExpiryDate(String expiryDate) {
this.expiryDate = expiryDate;
}
public String getExpiryDate() {
return expiryDate;
}
public void setProviderName(String providerName) {
this.providerName = providerName;
}
public String getProviderName() {
return providerName;
}
public void setReceiverDept(String receiverDept) {
this.receiverDept = receiverDept;
}
public String getReceiverDept() {
return receiverDept;
}
public void setReceivingArea(String receivingArea) {
this.receivingArea = receivingArea;
}
public String getReceivingArea() {
return receivingArea;
}
public void setPackageId(String packageId) {
this.packageId = packageId;
}
public String getPackageId() {
return packageId;
}
public void setUseType(String useType) {
this.useType = useType;
}
public String getUseType() {
return useType;
}
public void setTelephone(String telephone) {
this.telephone = telephone;
}
public String getTelephone() {
return telephone;
}
public void setProductionDate(Date productionDate) {
this.productionDate = productionDate;
}
public Date getProductionDate() {
return productionDate;
}
public void setWgh(String wgh) {
this.wgh = wgh;
}
public String getWgh() {
return wgh;
}
public void setHigh(String high) {
this.high = high;
}
public String getHigh() {
return high;
}
public void setQualityInspecStatus(String qualityInspecStatus) {
this.qualityInspecStatus = qualityInspecStatus;
}
public String getQualityInspecStatus() {
return qualityInspecStatus;
}
public void setPeriodUnit(String periodUnit) {
this.periodUnit = periodUnit;
}
public String getPeriodUnit() {
return periodUnit;
}
public void setPeriod(BigDecimal period) {
this.period = period;
}
public BigDecimal getPeriod() {
return period;
}
public String getReportTime() {
return reportTime;
}
public void setReportTime(String reportTime) {
this.reportTime = reportTime;
}
public String getNoticeTabId() {
return noticeTabId;
}
public void setNoticeTabId(String noticeTabId) {
this.noticeTabId = noticeTabId;
}
@Override @Override
public String toString() { public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)

386
zbf-system/src/main/java/com/zbf/system/domain/TRkReceivingGoodsTab.java
View File

@ -3,7 +3,9 @@ package com.zbf.system.domain;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
import org.apache.commons.lang3.builder.ToStringBuilder; import lombok.Getter;
import lombok.Setter;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.commons.lang3.builder.ToStringStyle;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
@ -16,6 +18,8 @@ import com.zbf.common.core.domain.BaseEntity;
* @author tony * @author tony
* @date 2024-06-18 * @date 2024-06-18
*/ */
@Getter
@Setter
public class TRkReceivingGoodsTab extends BaseEntity { public class TRkReceivingGoodsTab extends BaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ -236,386 +240,6 @@ private static final long serialVersionUID = 1L;
@Excel(name = "仓库类别",dictType = "storage_classification") @Excel(name = "仓库类别",dictType = "storage_classification")
private String levelType; private String levelType;
public String getAbc() {
return abc;
}
public void setAbc(String abc) {
this.abc = abc;
}
public String getLevelType() {
return levelType;
}
public void setLevelType(String levelType) {
this.levelType = levelType;
}
public void setId(String id) {
this.id = id;
}
public String getId() {
return id;
}
public void setSalesOrderNumber(String salesOrderNumber) {
this.salesOrderNumber = salesOrderNumber;
}
public String getSalesOrderNumber() {
return salesOrderNumber;
}
public void setNoticeId(String noticeId) {
this.noticeId = noticeId;
}
public String getNoticeId() {
return noticeId;
}
public void setGoodsId(String goodsId) {
this.goodsId = goodsId;
}
public String getGoodsId() {
return goodsId;
}
public void setGoodsName(String goodsName) {
this.goodsName = goodsName;
}
public String getGoodsName() {
return goodsName;
}
public void setUnit(String unit) {
this.unit = unit;
}
public String getUnit() {
return unit;
}
public void setSpecification(String specification) {
this.specification = specification;
}
public String getSpecification() {
return specification;
}
public void setRecoil(String recoil) {
this.recoil = recoil;
}
public String getRecoil() {
return recoil;
}
public void setBrand(String brand) {
this.brand = brand;
}
public String getBrand() {
return brand;
}
public void setPrice(BigDecimal price) {
this.price = price;
}
public BigDecimal getPrice() {
return price;
}
public void setTotalMoney(BigDecimal totalMoney) {
this.totalMoney = totalMoney;
}
public BigDecimal getTotalMoney() {
return totalMoney;
}
public void setArraMount(BigDecimal arraMount) {
this.arraMount = arraMount;
}
public BigDecimal getArraMount() {
return arraMount;
}
public void setRecNum(BigDecimal recNum) {
this.recNum = recNum;
}
public BigDecimal getRecNum() {
return recNum;
}
public void setProject(String project) {
this.project = project;
}
public String getProject() {
return project;
}
public void setNeedDept(String needDept) {
this.needDept = needDept;
}
public String getNeedDept() {
return needDept;
}
public void setUseType(String useType) {
this.useType = useType;
}
public String getUseType() {
return useType;
}
public void setScaleUnit(String scaleUnit) {
this.scaleUnit = scaleUnit;
}
public String getScaleUnit() {
return scaleUnit;
}
public void setTotalVolume(BigDecimal totalVolume) {
this.totalVolume = totalVolume;
}
public BigDecimal getTotalVolume() {
return totalVolume;
}
public void setTotalRoughWeight(BigDecimal totalRoughWeight) {
this.totalRoughWeight = totalRoughWeight;
}
public BigDecimal getTotalRoughWeight() {
return totalRoughWeight;
}
public void setTotalNetWeigh(BigDecimal totalNetWeigh) {
this.totalNetWeigh = totalNetWeigh;
}
public BigDecimal getTotalNetWeigh() {
return totalNetWeigh;
}
public void setAmount(Long amount) {
this.amount = amount;
}
public Long getAmount() {
return amount;
}
public void setProductionDate(Date productionDate) {
this.productionDate = productionDate;
}
public Date getProductionDate() {
return productionDate;
}
public void setStorageId(String storageId) {
this.storageId = storageId;
}
public String getStorageId() {
return storageId;
}
public void setStorageAreaId(String storageAreaId) {
this.storageAreaId = storageAreaId;
}
public String getStorageAreaId() {
return storageAreaId;
}
public void setPackageId(String packageId) {
this.packageId = packageId;
}
public String getPackageId() {
return packageId;
}
public void setGoodsTypeId(String goodsTypeId) {
this.goodsTypeId = goodsTypeId;
}
public String getGoodsTypeId() {
return goodsTypeId;
}
public void setBarcode(String barcode) {
this.barcode = barcode;
}
public String getBarcode() {
return barcode;
}
public void setGoodsVolume(BigDecimal goodsVolume) {
this.goodsVolume = goodsVolume;
}
public BigDecimal getGoodsVolume() {
return goodsVolume;
}
public void setPrintSts(String printSts) {
this.printSts = printSts;
}
public String getPrintSts() {
return printSts;
}
public void setPrintCs(Long printCs) {
this.printCs = printCs;
}
public Long getPrintCs() {
return printCs;
}
public void setNetWeigh(BigDecimal netWeigh) {
this.netWeigh = netWeigh;
}
public BigDecimal getNetWeigh() {
return netWeigh;
}
public void setKindNum(Long kindNum) {
this.kindNum = kindNum;
}
public Long getKindNum() {
return kindNum;
}
public void setExpiryDate(String expiryDate) {
this.expiryDate = expiryDate;
}
public String getExpiryDate() {
return expiryDate;
}
public void setOperateDate(Date operateDate) {
this.operateDate = operateDate;
}
public Date getOperateDate() {
return operateDate;
}
public void setProductStatus(String productStatus) {
this.productStatus = productStatus;
}
public String getProductStatus() {
return productStatus;
}
public void setReceivingStatus(String receivingStatus) {
this.receivingStatus = receivingStatus;
}
public String getReceivingStatus() {
return receivingStatus;
}
public void setInStatus(String inStatus) {
this.inStatus = inStatus;
}
public String getInStatus() {
return inStatus;
}
public void setCtl(String ctl) {
this.ctl = ctl;
}
public String getCtl() {
return ctl;
}
public void setQualityInspectionDate(String qualityInspectionDate) {
this.qualityInspectionDate = qualityInspectionDate;
}
public String getQualityInspectionDate() {
return qualityInspectionDate;
}
public void setStatus(String status) {
this.status = status;
}
public String getStatus() {
return status;
}
public void setAcceNum(Long acceNum) {
this.acceNum = acceNum;
}
public Long getAcceNum() {
return acceNum;
}
public void setQualityInspecStatus(String qualityInspecStatus) {
this.qualityInspecStatus = qualityInspecStatus;
}
public String getQualityInspecStatus() {
return qualityInspecStatus;
}
public void setOrderType(String orderType) {
this.orderType = orderType;
}
public String getOrderType() {
return orderType;
}
public void setApplicant(String applicant) {
this.applicant = applicant;
}
public String getApplicant() {
return applicant;
}
public void setSupplier(String supplier) {
this.supplier = supplier;
}
public String getSupplier() {
return supplier;
}
public void setQualified(String qualified) {
this.qualified = qualified;
}
public String getQualified() {
return qualified;
}
public void setPlanDate(String planDate) {
this.planDate = planDate;
}
public String getPlanDate() {
return planDate;
}
public void setPlanTime(String planTime) {
this.planTime = planTime;
}
public String getPlanTime() {
return planTime;
}
public void setNeedCycle(BigDecimal needCycle) {
this.needCycle = needCycle;
}
public BigDecimal getNeedCycle() {
return needCycle;
}
public void setNeedType(String needType) {
this.needType = needType;
}
public String getNeedType() {
return needType;
}
public void setBatchNo(String batchNo) {
this.batchNo = batchNo;
}
public String getBatchNo() {
return batchNo;
}
public void setReportTime(Date reportTime) {
this.reportTime = reportTime;
}
public Date getReportTime() {
return reportTime;
}
@Override @Override
public String toString() { public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

230
zbf-system/src/main/java/com/zbf/system/domain/TRkWareNoticeTabUpdate.java
View File

@ -7,6 +7,8 @@ import java.util.Map;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import com.zbf.common.core.domain.BaseEntity; import com.zbf.common.core.domain.BaseEntity;
import lombok.Data; import lombok.Data;
import lombok.Getter;
import lombok.Setter;
/** /**
* 入库通知单明细更新参数 * 入库通知单明细更新参数
@ -15,6 +17,8 @@ import java.util.Map;
* @date 2024-06-18 * @date 2024-06-18
*/ */
@Data @Data
@Getter
@Setter
public class TRkWareNoticeTabUpdate extends BaseEntity { public class TRkWareNoticeTabUpdate extends BaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ -91,230 +95,4 @@ public class TRkWareNoticeTabUpdate extends BaseEntity {
private String rfidTid; private String rfidTid;
private String rfidEpc; private String rfidEpc;
public String getRfidTid() {
return rfidTid;
}
public void setRfidTid(String rfidTid) {
this.rfidTid = rfidTid;
}
public String getRfidEpc() {
return rfidEpc;
}
public void setRfidEpc(String rfidEpc) {
this.rfidEpc = rfidEpc;
}
public String getTypes() {
return types;
}
public void setTypes(String types) {
this.types = types;
}
public String getRkMxId() {
return rkMxId;
}
public void setRkMxId(String rkMxId) {
this.rkMxId = rkMxId;
}
public String getLocationId() {
return locationId;
}
public void setLocationId(String locationId) {
this.locationId = locationId;
}
public Long getDeptId() {
return deptId;
}
public void setDeptId(Long deptId) {
this.deptId = deptId;
}
public String getCtlNo() {
return ctlNo;
}
public void setCtlNo(String ctlNo) {
this.ctlNo = ctlNo;
}
public String getRecordPerson() {
return recordPerson;
}
public void setRecordPerson(String recordPerson) {
this.recordPerson = recordPerson;
}
public String getRecordDate() {
return recordDate;
}
public void setRecordDate(String recordDate) {
this.recordDate = recordDate;
}
private String recordDate;
public Map<String, String> getExtras() {
return extras;
}
public void setExtras(Map<String, String> extras) {
this.extras = extras;
}
public String getUserName() {
return userName;
}
public void setUserName(String userName) {
this.userName = userName;
}
public String getStorageMode() {
return storageMode;
}
public void setStorageMode(String storageMode) {
this.storageMode = storageMode;
}
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getNoticeId() {
return noticeId;
}
public String getStorageShortName() {
return storageShortName;
}
public void setStorageShortName(String storageShortName) {
this.storageShortName = storageShortName;
}
public void setNoticeId(String noticeId) {
this.noticeId = noticeId;
}
public String getStorageId() {
return storageId;
}
public void setStorageId(String storageId) {
this.storageId = storageId;
}
public String getStorageLocation() {
return storageLocation;
}
public void setStorageLocation(String storageLocation) {
this.storageLocation = storageLocation;
}
public String getStorageAreaId() {
return storageAreaId;
}
public void setStorageAreaId(String storageAreaId) {
this.storageAreaId = storageAreaId;
}
public List<TRkWareNoticeTab> getTrkWareNoticeTabList() {
return trkWareNoticeTabList;
}
public void setTrkWareNoticeTabList(List<TRkWareNoticeTab> trkWareNoticeTabList) {
this.trkWareNoticeTabList = trkWareNoticeTabList;
}
public List<TOngoodsshelf> gettOngoodsshelfList() {
return tOngoodsshelfList;
}
public void settOngoodsshelfList(List<TOngoodsshelf> tOngoodsshelfList) {
this.tOngoodsshelfList = tOngoodsshelfList;
}
public String getGoodsId() {
return goodsId;
}
public void setGoodsId(String goodsId) {
this.goodsId = goodsId;
}
public String getGoodsName() {
return goodsName;
}
public void setGoodsName(String goodsName) {
this.goodsName = goodsName;
}
public int getPrintNum() {
return printNum;
}
public void setPrintNum(int printNum) {
this.printNum = printNum;
}
public int getReceiveNum() {
return receiveNum;
}
public void setReceiveNum(int receiveNum) {
this.receiveNum = receiveNum;
}
public String getSalesOrderNumber() {
return salesOrderNumber;
}
public void setSalesOrderNumber(String salesOrderNumber) {
this.salesOrderNumber = salesOrderNumber;
}
public String getSpecification() {
return specification;
}
public void setSpecification(String specification) {
this.specification = specification;
}
public String getFictitious() {
return fictitious;
}
public void setFictitious(String fictitious) {
this.fictitious = fictitious;
}
public String getDeliveryId() {
return deliveryId;
}
public void setDeliveryId(String deliveryId) {
this.deliveryId = deliveryId;
}
} }

51
zbf-system/src/main/java/com/zbf/system/service/impl/TRkWareNoticeServiceImpl.java
View File

@ -1391,7 +1391,7 @@ public class TRkWareNoticeServiceImpl extends ServiceImpl<TRkWareNoticeMapper, T
List<TMiStockF> virtualStockRecordsToInsert = new ArrayList<>(); List<TMiStockF> virtualStockRecordsToInsert = new ArrayList<>();
// 判断通知单明细是否存在为完成的 // 判断通知单明细是否存在为完成的
Boolean allNoticeTabsCompleted = true; boolean allNoticeTabsCompleted = true;
String inboundNoticeId = ""; String inboundNoticeId = "";
TRkWareNotice inboundNotice = null; TRkWareNotice inboundNotice = null;
@ -1399,14 +1399,25 @@ public class TRkWareNoticeServiceImpl extends ServiceImpl<TRkWareNoticeMapper, T
String callNoticeId = ""; String callNoticeId = "";
// 遍历提交的入库任务列表 // 遍历提交的入库任务列表
for (TOngoodsshelf submittedInboundTask : shelfConfirmRequest.gettOngoodsshelfList()) { for (TOngoodsshelf submittedInboundTask : shelfConfirmRequest.getTOngoodsshelfList()) {
TOngoodsshelf storedInboundTask = tOngoodsshelfMapper.selectTOngoodsshelfById(submittedInboundTask.getId());
if (storedInboundTask == null) {
resultMap.put("error", "入库任务不存在，请刷新后重试");
return resultMap;
}
// 备份呼叫任务号 // 备份呼叫任务号
callNoticeId = storedInboundTask.getCallNoticeId();
if (StringUtils.isBlank(callNoticeId)) {
callNoticeId = submittedInboundTask.getCallNoticeId(); callNoticeId = submittedInboundTask.getCallNoticeId();
}
if (StringUtils.isBlank(inboundNoticeId)) { if (StringUtils.isBlank(inboundNoticeId)) {
inboundNoticeId = storedInboundTask.getAcceId();
if (StringUtils.isBlank(inboundNoticeId)) {
inboundNoticeId = submittedInboundTask.getAcceId(); inboundNoticeId = submittedInboundTask.getAcceId();
}
// 查询入库通知单 // 查询入库通知单
inboundNotice = tRkWareNoticeMapper.selectTRkWareNoticeByNoticeId(inboundNoticeId); inboundNotice = tRkWareNoticeMapper.selectTRkWareNoticeByNoticeId(inboundNoticeId);
@ -1422,7 +1433,7 @@ public class TRkWareNoticeServiceImpl extends ServiceImpl<TRkWareNoticeMapper, T
} }
} }
// 根据ID查询入库通知单明细数据 // 根据ID查询入库通知单明细数据
TRkWareNoticeTab noticeTabToUpdate = tRkWareNoticeMapper.selectTRkWareNoticeTabById(submittedInboundTask.getNoticeTabId()); TRkWareNoticeTab noticeTabToUpdate = tRkWareNoticeMapper.selectTRkWareNoticeTabById(storedInboundTask.getNoticeTabId());
if (noticeTabToUpdate == null) { if (noticeTabToUpdate == null) {
resultMap.put("error", "物料的通知单明细不存在"); resultMap.put("error", "物料的通知单明细不存在");
@ -1438,7 +1449,9 @@ public class TRkWareNoticeServiceImpl extends ServiceImpl<TRkWareNoticeMapper, T
//累计入库数量 //累计入库数量
BigDecimal accumulatedShelvedQuantity = noticeTabToUpdate.getAcceNum() == null ? BigDecimal.ZERO : noticeTabToUpdate.getAcceNum(); BigDecimal accumulatedShelvedQuantity = noticeTabToUpdate.getAcceNum() == null ? BigDecimal.ZERO : noticeTabToUpdate.getAcceNum();
// 本次上架数量 // 本次上架数量
BigDecimal currentShelvedQuantity = submittedInboundTask.getAccNum() == null ? BigDecimal.ZERO : submittedInboundTask.getAccNum(); BigDecimal currentShelvedQuantity = submittedInboundTask.getAccNum() == null
? (storedInboundTask.getAccNum() == null ? BigDecimal.ZERO : storedInboundTask.getAccNum())
: submittedInboundTask.getAccNum();
if (currentShelvedQuantity.compareTo(BigDecimal.ZERO) == 0) { if (currentShelvedQuantity.compareTo(BigDecimal.ZERO) == 0) {
resultMap.put("error", "物料【" + noticeTabToUpdate.getGoodsName() + "】的上架数量不能为0"); resultMap.put("error", "物料【" + noticeTabToUpdate.getGoodsName() + "】的上架数量不能为0");
@ -1475,21 +1488,21 @@ public class TRkWareNoticeServiceImpl extends ServiceImpl<TRkWareNoticeMapper, T
tRkWareNoticeTabMapper.updateTRkWareNoticeTab(noticeTabToUpdate); tRkWareNoticeTabMapper.updateTRkWareNoticeTab(noticeTabToUpdate);
updatedNoticeTabs.add(noticeTabToUpdate); updatedNoticeTabs.add(noticeTabToUpdate);
// 入库任务: 3 确认完成 storedInboundTask.setStatus(InboundTaskStatus.CONFIRMED.getCode());
submittedInboundTask.setStatus(InboundTaskStatus.CONFIRMED.getCode()); storedInboundTask.setAccNum(currentShelvedQuantity);
// 库位 // 库位
submittedInboundTask.setLocationId(shelfConfirmRequest.getStorageLocation()); storedInboundTask.setLocationId(shelfConfirmRequest.getStorageLocation());
// 托盘号 // 托盘号
submittedInboundTask.setCtl(shelfConfirmRequest.getCtlNo()); storedInboundTask.setCtl(shelfConfirmRequest.getCtlNo());
// 入库时间 // 入库时间
submittedInboundTask.setOndate(DateUtils.getTime()); storedInboundTask.setOndate(DateUtils.getTime());
storedInboundTask.setUpdateBy(shelfConfirmRequest.getUserName());
TOngoodsshelf storedInboundTask = tOngoodsshelfMapper.selectTOngoodsshelfById(submittedInboundTask.getId()); storedInboundTask.setUpdateTime(new Date());
// 生成入库任务bak数据 // 生成入库任务bak数据
TOngoodsshelfBak inboundTaskArchive = new TOngoodsshelfBak(); TOngoodsshelfBak inboundTaskArchive = new TOngoodsshelfBak();
BeanUtils.copyProperties(submittedInboundTask, inboundTaskArchive); BeanUtils.copyProperties(storedInboundTask, inboundTaskArchive);
// inboundTaskArchive.setId(OrderCodeFactory.getOrderCode("TSB", "")); // inboundTaskArchive.setId(OrderCodeFactory.getOrderCode("TSB", ""));
tOngoodsshelfBakMapper.insertTOngoodsshelfBak(inboundTaskArchive); tOngoodsshelfBakMapper.insertTOngoodsshelfBak(inboundTaskArchive);
@ -1501,7 +1514,7 @@ public class TRkWareNoticeServiceImpl extends ServiceImpl<TRkWareNoticeMapper, T
} }
// 删除入库任务 // 删除入库任务
tOngoodsshelfMapper.deleteTOngoodsshelfById(submittedInboundTask.getId()); tOngoodsshelfMapper.deleteTOngoodsshelfById(storedInboundTask.getId());
} }
if (!StringUtils.isEmpty(callNoticeId)) { if (!StringUtils.isEmpty(callNoticeId)) {
@ -1509,7 +1522,7 @@ public class TRkWareNoticeServiceImpl extends ServiceImpl<TRkWareNoticeMapper, T
remainingTaskQuery.setCallNoticeId(callNoticeId); remainingTaskQuery.setCallNoticeId(callNoticeId);
List<TOngoodsshelf> remainingInboundTasks = tOngoodsshelfMapper.selectTOngoodsshelfList(remainingTaskQuery); List<TOngoodsshelf> remainingInboundTasks = tOngoodsshelfMapper.selectTOngoodsshelfList(remainingTaskQuery);
if (remainingInboundTasks.size() == 0) { if (remainingInboundTasks.isEmpty()) {
// 关闭入库任务通知 // 关闭入库任务通知
TCallNotice callNoticeUpdate = new TCallNotice(); TCallNotice callNoticeUpdate = new TCallNotice();
callNoticeUpdate.setId(callNoticeId); callNoticeUpdate.setId(callNoticeId);
@ -1539,7 +1552,7 @@ public class TRkWareNoticeServiceImpl extends ServiceImpl<TRkWareNoticeMapper, T
BigDecimal shelvedQuantity = realStockRecord.getShelvesNum(); BigDecimal shelvedQuantity = realStockRecord.getShelvesNum();
BigDecimal unitPrice = baseGoods.getPrice(); BigDecimal unitPrice = baseGoods.getPrice();
if (unitPrice == null || unitPrice.compareTo(BigDecimal.ZERO) == 0) { if (unitPrice == null || unitPrice.compareTo(BigDecimal.ZERO) == 0) {
unitPrice = BigDecimal.ZERO; // 默认值为 1 unitPrice = BigDecimal.ONE; // 默认值为 1
} }
if (shelvedQuantity.compareTo(BigDecimal.ZERO) == 0) { if (shelvedQuantity.compareTo(BigDecimal.ZERO) == 0) {
@ -1603,9 +1616,9 @@ public class TRkWareNoticeServiceImpl extends ServiceImpl<TRkWareNoticeMapper, T
} }
// 查询是否存在收货表数据 // 查询是否存在收货表数据
if (updatedNoticeTabs.size() > 0) { if (!updatedNoticeTabs.isEmpty()) {
Map<String, TRkReceivingGoodsTab> receivingGoodsTabById = new HashMap<String, TRkReceivingGoodsTab>(); Map<String, TRkReceivingGoodsTab> receivingGoodsTabById = new HashMap<>();
if (receivingGoods != null) { if (receivingGoods != null) {
for (TRkReceivingGoodsTab receivingGoodsTab : receivingGoods.getTRkReceivingGoodsTabList()) { for (TRkReceivingGoodsTab receivingGoodsTab : receivingGoods.getTRkReceivingGoodsTabList()) {
@ -1615,7 +1628,7 @@ public class TRkWareNoticeServiceImpl extends ServiceImpl<TRkWareNoticeMapper, T
List<TRkReceivingGoodsTab> receivingGoodsTabsToInsert = new ArrayList<>(); List<TRkReceivingGoodsTab> receivingGoodsTabsToInsert = new ArrayList<>();
// 存货表更新集合 // 存货表更新集合
List<TRkReceivingGoodsTab> receivingGoodsTabsToUpdate = new ArrayList<TRkReceivingGoodsTab>(); List<TRkReceivingGoodsTab> receivingGoodsTabsToUpdate = new ArrayList<>();
for (TRkWareNoticeTab updatedNoticeTab : updatedNoticeTabs) { for (TRkWareNoticeTab updatedNoticeTab : updatedNoticeTabs) {
TRkReceivingGoodsTab receivingGoodsTabToUpdate = receivingGoodsTabById.get(updatedNoticeTab.getId()); TRkReceivingGoodsTab receivingGoodsTabToUpdate = receivingGoodsTabById.get(updatedNoticeTab.getId());
@ -1654,7 +1667,7 @@ public class TRkWareNoticeServiceImpl extends ServiceImpl<TRkWareNoticeMapper, T
// inboundNoticeBakRecord.setId(inboundNoticeBakId); // inboundNoticeBakRecord.setId(inboundNoticeBakId);
tRkWareNoticeBakMapper.insertTRkWareNoticeBak(inboundNoticeBakRecord); tRkWareNoticeBakMapper.insertTRkWareNoticeBak(inboundNoticeBakRecord);
List<TRkWareNoticeTabBak> inboundNoticeTabBakRecords = new ArrayList<TRkWareNoticeTabBak>(); List<TRkWareNoticeTabBak> inboundNoticeTabBakRecords = new ArrayList<>();
for (TRkWareNoticeTab inboundNoticeTab : inboundNotice.getTRkWareNoticeTabList()) { for (TRkWareNoticeTab inboundNoticeTab : inboundNotice.getTRkWareNoticeTabList()) {
TRkWareNoticeTabBak inboundNoticeTabBakRecord = new TRkWareNoticeTabBak(); TRkWareNoticeTabBak inboundNoticeTabBakRecord = new TRkWareNoticeTabBak();
// inboundNoticeTab.setId(OrderCodeFactory.getOrderCode("TRKTABBAK", "")); // inboundNoticeTab.setId(OrderCodeFactory.getOrderCode("TRKTABBAK", ""));

22
zbf-system/src/main/resources/mapper/system/TRkReceivingGoodsMapper.xml
View File

@ -290,9 +290,27 @@
</delete> </delete>
<insert id="batchTRkReceivingGoodsTab"> <insert id="batchTRkReceivingGoodsTab">
insert into t_rk_receiving_goods_tab(id, sales_order_number, notice_id, goods_id, goods_name, unit, specification, recoil, brand, price, total_money, arra_mount, rec_num, project, need_dept, use_type, scale_unit, total_volume, total_rough_weight, total_net_weigh, amount, production_date, storage_id, storage_area_id, package_id, remark, goods_type_id, barcode, goods_volume, print_sts, print_cs, net_weigh, kind_num, expiry_date, operate_date, product_status, receiving_status, in_status, ctl, quality_inspection_date, status, acce_num, quality_inspec_status, order_type, applicant, supplier, qualified, update_time, plan_date, plan_time, need_cycle, need_type, batch_no, report_time, create_time, create_by, update_by,abc,level_type) values insert into t_rk_receiving_goods_tab(id, sales_order_number, notice_id, goods_id, goods_name, unit,
specification, recoil, brand, price, total_money, arra_mount, rec_num, project, need_dept, use_type,
scale_unit, total_volume, total_rough_weight, total_net_weigh, amount, production_date, storage_id,
storage_area_id, package_id, remark, goods_type_id, barcode, goods_volume, print_sts, print_cs, net_weigh,
kind_num, expiry_date, operate_date, product_status, receiving_status, in_status, ctl,
quality_inspection_date, status, acce_num, quality_inspec_status, order_type, applicant, supplier,
qualified, update_time, plan_date, plan_time, need_cycle, need_type, batch_no, report_time, create_time,
create_by, update_by,abc,level_type) values
<foreach item="item" index="index" collection="list" separator=","> <foreach item="item" index="index" collection="list" separator=",">
(#{item.id}, #{item.salesOrderNumber}, #{item.noticeId}, #{item.goodsId}, #{item.goodsName}, #{item.unit}, #{item.specification}, #{item.recoil}, #{item.brand}, #{item.price}, #{item.totalMoney}, #{item.arraMount}, #{item.recNum}, #{item.project}, #{item.needDept}, #{item.useType}, #{item.scaleUnit}, #{item.totalVolume}, #{item.totalRoughWeight}, #{item.totalNetWeigh}, #{item.amount}, #{item.productionDate}, #{item.storageId}, #{item.storageAreaId}, #{item.packageId}, #{item.remark}, #{item.goodsTypeId}, #{item.barcode}, #{item.goodsVolume}, #{item.printSts}, #{item.printCs}, #{item.netWeigh}, #{item.kindNum}, #{item.expiryDate}, #{item.operateDate}, #{item.productStatus}, #{item.receivingStatus}, #{item.inStatus}, #{item.ctl}, #{item.qualityInspectionDate}, #{item.status}, #{item.acceNum}, #{item.qualityInspecStatus}, #{item.orderType}, #{item.applicant}, #{item.supplier}, #{item.qualified}, #{item.updateTime}, #{item.planDate}, #{item.planTime}, #{item.needCycle}, #{item.needType}, #{item.batchNo}, #{item.reportTime}, #{item.createTime}, #{item.createBy}, #{item.updateBy}, #{item.abc}, #{item.levelType}) (#{item.id}, #{item.salesOrderNumber}, #{item.noticeId}, #{item.goodsId}, #{item.goodsName},
#{item.unit}, #{item.specification}, #{item.recoil}, #{item.brand}, #{item.price}, #{item.totalMoney},
#{item.arraMount}, #{item.recNum}, #{item.project}, #{item.needDept}, #{item.useType},
#{item.scaleUnit}, #{item.totalVolume}, #{item.totalRoughWeight}, #{item.totalNetWeigh}, #{item.amount},
#{item.productionDate}, #{item.storageId}, #{item.storageAreaId}, #{item.packageId}, #{item.remark},
#{item.goodsTypeId}, #{item.barcode}, #{item.goodsVolume}, #{item.printSts}, #{item.printCs},
#{item.netWeigh}, #{item.kindNum}, #{item.expiryDate}, #{item.operateDate}, #{item.productStatus},
#{item.receivingStatus}, #{item.inStatus}, #{item.ctl}, #{item.qualityInspectionDate}, #{item.status},
#{item.acceNum}, #{item.qualityInspecStatus}, #{item.orderType}, #{item.applicant}, #{item.supplier},
#{item.qualified}, #{item.updateTime}, #{item.planDate}, #{item.planTime}, #{item.needCycle},
#{item.needType}, #{item.batchNo}, #{item.reportTime}, #{item.createTime}, #{item.createBy},
#{item.updateBy}, #{item.abc}, #{item.levelType})
</foreach> </foreach>
</insert> </insert>

173
zbf-system/src/main/resources/mapper/system/TRkWareNoticeMapper.xml
View File

@ -231,9 +231,107 @@
</select> </select>
<select id="selectTRkWareNoticeByNoticeId" parameterType="String" resultMap="TRkWareNoticeTRkWareNoticeTabResult"> <select id="selectTRkWareNoticeByNoticeId" parameterType="String" resultMap="TRkWareNoticeTRkWareNoticeTabResult">
select a.id, a.notice_id, a.is_avg_exec, a.delivery_id, a.provider_id, a.provider_name, a.purchase_id, a.shipping_dept, a.contact, a.telephone, a.receive_addr, a.sende_date, a.purchase_dept, a.remark, a.receiving_area, a.use_receiver, a.use_custodian, a.use_leader, a.receiver, a.applicant, a.produclot_id, a.receiver_dept, a.tenderer, a.operator_id, a.factory_id, a.storage_mode, a.status, a.receiving_status, a.order_type, a.create_by, a.update_by, a.create_time, a.update_time,a.dept_id,a.rec_person,a.is_avg_exec,a.purchaser,a.arra_date,a.document_status, select a.id,
b.id as sub_id, b.sales_order_number as sub_sales_order_number, b.notice_id as sub_notice_id, b.goods_id as sub_goods_id, b.goods_name as sub_goods_name, b.unit as sub_unit, b.specification as sub_specification, b.recoil as sub_recoil, b.brand as sub_brand, b.price as sub_price, b.total_money as sub_total_money, b.arra_mount as sub_arra_mount, b.rec_num as sub_rec_num, b.project as sub_project, b.need_dept as sub_need_dept, b.use_type as sub_use_type, b.scale_unit as sub_scale_unit, b.total_volume as sub_total_volume, b.total_rough_weight as sub_total_rough_weight, b.total_net_weigh as sub_total_net_weigh, b.amount as sub_amount, b.production_date as sub_production_date, b.storage_id as sub_storage_id, b.storage_area_id as sub_storage_area_id, b.package_id as sub_package_id, b.remark as sub_remark, b.goods_type_id as sub_goods_type_id, b.barcode as sub_barcode, b.goods_volume as sub_goods_volume, b.print_sts as sub_print_sts, b.print_cs as sub_print_cs, b.net_weigh as sub_net_weigh, b.kind_num as sub_kind_num, b.expiry_date as sub_expiry_date, b.operate_date as sub_operate_date, b.product_status as sub_product_status, b.receiving_status as sub_receiving_status, b.in_status as sub_in_status, b.ctl as sub_ctl, b.quality_inspection_date as sub_quality_inspection_date, b.status as sub_status, b.acce_num as sub_acce_num, b.quality_inspec_status as sub_quality_inspec_status, b.order_type as sub_order_type, b.applicant as sub_applicant, b.supplier as sub_supplier, b.qualified as sub_qualified, b.update_time as sub_update_time, b.plan_date as sub_plan_date, b.plan_time as sub_plan_time, b.need_cycle as sub_need_cycle, b.need_type as sub_need_type, b.batch_no as sub_batch_no, b.report_time as sub_report_time, b.create_time as sub_create_time, b.create_by as sub_create_by, b.update_by as sub_update_by, b.level_type as sub_level_type a.notice_id,
, b.storage_short_name as sub_storage_short_name, b.storage_location as sub_storage_location,b.data_source as sub_data_source, a.is_avg_exec,
a.delivery_id,
a.provider_id,
a.provider_name,
a.purchase_id,
a.shipping_dept,
a.contact,
a.telephone,
a.receive_addr,
a.sende_date,
a.purchase_dept,
a.remark,
a.receiving_area,
a.use_receiver,
a.use_custodian,
a.use_leader,
a.receiver,
a.applicant,
a.produclot_id,
a.receiver_dept,
a.tenderer,
a.operator_id,
a.factory_id,
a.storage_mode,
a.status,
a.receiving_status,
a.order_type,
a.create_by,
a.update_by,
a.create_time,
a.update_time,
a.dept_id,
a.rec_person,
a.is_avg_exec,
a.purchaser,
a.arra_date,
a.document_status,
b.id as sub_id,
b.sales_order_number as sub_sales_order_number,
b.notice_id as sub_notice_id,
b.goods_id as sub_goods_id,
b.goods_name as sub_goods_name,
b.unit as sub_unit,
b.specification as sub_specification,
b.recoil as sub_recoil,
b.brand as sub_brand,
b.price as sub_price,
b.total_money as sub_total_money,
b.arra_mount as sub_arra_mount,
b.rec_num as sub_rec_num,
b.project as sub_project,
b.need_dept as sub_need_dept,
b.use_type as sub_use_type,
b.scale_unit as sub_scale_unit,
b.total_volume as sub_total_volume,
b.total_rough_weight as sub_total_rough_weight,
b.total_net_weigh as sub_total_net_weigh,
b.amount as sub_amount,
b.production_date as sub_production_date,
b.storage_id as sub_storage_id,
b.storage_area_id as sub_storage_area_id,
b.package_id as sub_package_id,
b.remark as sub_remark,
b.goods_type_id as sub_goods_type_id,
b.barcode as sub_barcode,
b.goods_volume as sub_goods_volume,
b.print_sts as sub_print_sts,
b.print_cs as sub_print_cs,
b.net_weigh as sub_net_weigh,
b.kind_num as sub_kind_num,
b.expiry_date as sub_expiry_date,
b.operate_date as sub_operate_date,
b.product_status as sub_product_status,
b.receiving_status as sub_receiving_status,
b.in_status as sub_in_status,
b.ctl as sub_ctl,
b.quality_inspection_date as sub_quality_inspection_date,
b.status as sub_status,
b.acce_num as sub_acce_num,
b.quality_inspec_status as sub_quality_inspec_status,
b.order_type as sub_order_type,
b.applicant as sub_applicant,
b.supplier as sub_supplier,
b.qualified as sub_qualified,
b.update_time as sub_update_time,
b.plan_date as sub_plan_date,
b.plan_time as sub_plan_time,
b.need_cycle as sub_need_cycle,
b.need_type as sub_need_type,
b.batch_no as sub_batch_no,
b.report_time as sub_report_time,
b.create_time as sub_create_time,
b.create_by as sub_create_by,
b.update_by as sub_update_by,
b.level_type as sub_level_type
,
b.storage_short_name as sub_storage_short_name,
b.storage_location as sub_storage_location,
b.data_source as sub_data_source,
b.total_arra_amout as sub_total_arra_amout, b.total_arra_amout as sub_total_arra_amout,
b.no_tax_price as sub_no_tax_price, b.no_tax_price as sub_no_tax_price,
b.no_tax_money as sub_no_tax_money, b.no_tax_money as sub_no_tax_money,
@ -256,7 +354,7 @@ b.id as sub_id, b.sales_order_number as sub_sales_order_number, b.notice_id as s
from t_rk_ware_notice a from t_rk_ware_notice a
left join t_rk_ware_notice_tab b on b.notice_id = a.id left join t_rk_ware_notice_tab b on b.notice_id = a.id
where a.notice_id = #{id} where a.notice_id = #{id}
</select> </select>
<select id="selectTRkWareNoticeByDeliveryId" parameterType="String" resultMap="TRkWareNoticeTRkWareNoticeTabResult"> <select id="selectTRkWareNoticeByDeliveryId" parameterType="String" resultMap="TRkWareNoticeTRkWareNoticeTabResult">
select a.id, a.notice_id, a.is_avg_exec, a.delivery_id, a.provider_id, a.provider_name, a.purchase_id, a.shipping_dept, a.contact, a.telephone, a.receive_addr, a.sende_date, a.purchase_dept, a.remark, a.receiving_area, a.use_receiver, a.use_custodian, a.use_leader, a.receiver, a.applicant, a.produclot_id, a.receiver_dept, a.tenderer, a.operator_id, a.factory_id, a.storage_mode, a.status, a.receiving_status, a.order_type, a.create_by, a.update_by, a.create_time, a.update_time,a.dept_id,a.rec_person,a.is_avg_exec,a.purchaser,a.arra_date,a.document_status, select a.id, a.notice_id, a.is_avg_exec, a.delivery_id, a.provider_id, a.provider_name, a.purchase_id, a.shipping_dept, a.contact, a.telephone, a.receive_addr, a.sende_date, a.purchase_dept, a.remark, a.receiving_area, a.use_receiver, a.use_custodian, a.use_leader, a.receiver, a.applicant, a.produclot_id, a.receiver_dept, a.tenderer, a.operator_id, a.factory_id, a.storage_mode, a.status, a.receiving_status, a.order_type, a.create_by, a.update_by, a.create_time, a.update_time,a.dept_id,a.rec_person,a.is_avg_exec,a.purchaser,a.arra_date,a.document_status,
@ -468,8 +566,68 @@ b.id as sub_id, b.sales_order_number as sub_sales_order_number, b.notice_id as s
</select> </select>
<select id="selectTRkWareNoticeTabById" parameterType="String" resultMap="TRkWareNoticeTabResult"> <select id="selectTRkWareNoticeTabById" parameterType="String" resultMap="TRkWareNoticeTabResult">
select b.id as sub_id, b.sales_order_number as sub_sales_order_number, b.notice_id as sub_notice_id, b.goods_id as sub_goods_id, b.goods_name as sub_goods_name, b.unit as sub_unit, b.specification as sub_specification, b.recoil as sub_recoil, b.brand as sub_brand, b.price as sub_price, b.total_money as sub_total_money, b.arra_mount as sub_arra_mount, b.rec_num as sub_rec_num, b.project as sub_project, b.need_dept as sub_need_dept, b.use_type as sub_use_type, b.scale_unit as sub_scale_unit, b.total_volume as sub_total_volume, b.total_rough_weight as sub_total_rough_weight, b.total_net_weigh as sub_total_net_weigh, b.amount as sub_amount, b.production_date as sub_production_date, b.storage_id as sub_storage_id, b.storage_area_id as sub_storage_area_id, b.package_id as sub_package_id, b.remark as sub_remark, b.goods_type_id as sub_goods_type_id, b.barcode as sub_barcode, b.goods_volume as sub_goods_volume, b.print_sts as sub_print_sts, b.print_cs as sub_print_cs, b.net_weigh as sub_net_weigh, b.kind_num as sub_kind_num, b.expiry_date as sub_expiry_date, b.operate_date as sub_operate_date, b.product_status as sub_product_status, b.receiving_status as sub_receiving_status, b.in_status as sub_in_status, b.ctl as sub_ctl, b.quality_inspection_date as sub_quality_inspection_date, b.status as sub_status, b.acce_num as sub_acce_num, b.quality_inspec_status as sub_quality_inspec_status, b.order_type as sub_order_type, b.applicant as sub_applicant, b.supplier as sub_supplier, b.qualified as sub_qualified, b.update_time as sub_update_time, b.plan_date as sub_plan_date, b.plan_time as sub_plan_time, b.need_cycle as sub_need_cycle, b.need_type as sub_need_type, b.batch_no as sub_batch_no, b.report_time as sub_report_time, b.create_time as sub_create_time, b.create_by as sub_create_by, b.update_by as sub_update_by , b.level_type as sub_level_type select b.id as sub_id,
, b.storage_short_name as sub_storage_short_name, b.storage_location as sub_storage_location,b.data_source as sub_data_source, b.sales_order_number as sub_sales_order_number,
b.notice_id as sub_notice_id,
b.goods_id as sub_goods_id,
b.goods_name as sub_goods_name,
b.unit as sub_unit,
b.specification as sub_specification,
b.recoil as sub_recoil,
b.brand as sub_brand,
b.price as sub_price,
b.total_money as sub_total_money,
b.arra_mount as sub_arra_mount,
b.rec_num as sub_rec_num,
b.project as sub_project,
b.need_dept as sub_need_dept,
b.use_type as sub_use_type,
b.scale_unit as sub_scale_unit,
b.total_volume as sub_total_volume,
b.total_rough_weight as sub_total_rough_weight,
b.total_net_weigh as sub_total_net_weigh,
b.amount as sub_amount,
b.production_date as sub_production_date,
b.storage_id as sub_storage_id,
b.storage_area_id as sub_storage_area_id,
b.package_id as sub_package_id,
b.remark as sub_remark,
b.goods_type_id as sub_goods_type_id,
b.barcode as sub_barcode,
b.goods_volume as sub_goods_volume,
b.print_sts as sub_print_sts,
b.print_cs as sub_print_cs,
b.net_weigh as sub_net_weigh,
b.kind_num as sub_kind_num,
b.expiry_date as sub_expiry_date,
b.operate_date as sub_operate_date,
b.product_status as sub_product_status,
b.receiving_status as sub_receiving_status,
b.in_status as sub_in_status,
b.ctl as sub_ctl,
b.quality_inspection_date as sub_quality_inspection_date,
b.status as sub_status,
b.acce_num as sub_acce_num,
b.quality_inspec_status as sub_quality_inspec_status,
b.order_type as sub_order_type,
b.applicant as sub_applicant,
b.supplier as sub_supplier,
b.qualified as sub_qualified,
b.update_time as sub_update_time,
b.plan_date as sub_plan_date,
b.plan_time as sub_plan_time,
b.need_cycle as sub_need_cycle,
b.need_type as sub_need_type,
b.batch_no as sub_batch_no,
b.report_time as sub_report_time,
b.create_time as sub_create_time,
b.create_by as sub_create_by,
b.update_by as sub_update_by,
b.level_type as sub_level_type
,
b.storage_short_name as sub_storage_short_name,
b.storage_location as sub_storage_location,
b.data_source as sub_data_source,
b.total_arra_amout as sub_total_arra_amout, b.total_arra_amout as sub_total_arra_amout,
b.no_tax_price as sub_no_tax_price, b.no_tax_price as sub_no_tax_price,
b.no_tax_money as sub_no_tax_money, b.no_tax_money as sub_no_tax_money,
@ -489,7 +647,8 @@ b.id as sub_id, b.sales_order_number as sub_sales_order_number, b.notice_id as s
b.need_tel as sub_need_tel, b.need_tel as sub_need_tel,
b.purchase_id as sub_purchase_id, b.purchase_id as sub_purchase_id,
b.receiving_num as sub_receiving_num b.receiving_num as sub_receiving_num
from t_rk_ware_notice_tab b where b.id = #{id} from t_rk_ware_notice_tab b
where b.id = #{id}
</select> </select>
<insert id="batchTRkWareNoticeTab"> <insert id="batchTRkWareNoticeTab">