3.1.5:
-PDA5楼组装出库：4楼到5楼的柜体，如果是多个柜体合为一个原材料条码的，只生成一个生产明细，生产明细保存对应的原材料条码 -PDA5楼生产入库：生产入库逻辑完善master
parent
68bf18d502
commit
20bfc09eac
@ -0,0 +1,88 @@
|
||||
package com.hw.mes.api.domain;
|
||||
|
||||
import com.hw.common.core.annotation.Excel;
|
||||
import com.hw.common.core.web.domain.BaseEntity;
|
||||
import org.apache.commons.lang3.builder.ToStringBuilder;
|
||||
import org.apache.commons.lang3.builder.ToStringStyle;
|
||||
|
||||
/**
|
||||
* 绑定条码对象 mes_base_bind_barcode
|
||||
*
|
||||
* @author Open Platform
|
||||
* @date 2024-09-25
|
||||
*/
|
||||
public class MesBaseBindBarcode extends BaseEntity
|
||||
{
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/** 主键 */
|
||||
private Long bindBarcodeId;
|
||||
|
||||
/** 条码ID */
|
||||
@Excel(name = "条码ID")
|
||||
private Long barcodeId;
|
||||
|
||||
private String barcodeInfo;
|
||||
|
||||
private Long saleOrderId;
|
||||
|
||||
/** 绑定的条码内容 */
|
||||
@Excel(name = "绑定的条码内容")
|
||||
private String bindBarcode;
|
||||
|
||||
public void setBindBarcodeId(Long bindBarcodeId)
|
||||
{
|
||||
this.bindBarcodeId = bindBarcodeId;
|
||||
}
|
||||
|
||||
public Long getBindBarcodeId()
|
||||
{
|
||||
return bindBarcodeId;
|
||||
}
|
||||
public void setBarcodeId(Long barcodeId)
|
||||
{
|
||||
this.barcodeId = barcodeId;
|
||||
}
|
||||
|
||||
public Long getBarcodeId()
|
||||
{
|
||||
return barcodeId;
|
||||
}
|
||||
|
||||
public String getBarcodeInfo() {
|
||||
return barcodeInfo;
|
||||
}
|
||||
|
||||
public void setBarcodeInfo(String barcodeInfo) {
|
||||
this.barcodeInfo = barcodeInfo;
|
||||
}
|
||||
|
||||
public Long getSaleOrderId() {
|
||||
return saleOrderId;
|
||||
}
|
||||
|
||||
public void setSaleOrderId(Long saleOrderId) {
|
||||
this.saleOrderId = saleOrderId;
|
||||
}
|
||||
|
||||
public void setBindBarcode(String bindBarcode)
|
||||
{
|
||||
this.bindBarcode = bindBarcode;
|
||||
}
|
||||
|
||||
public String getBindBarcode()
|
||||
{
|
||||
return bindBarcode;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
|
||||
.append("bindBarcodeId", getBindBarcodeId())
|
||||
.append("barcodeId", getBarcodeId())
|
||||
.append("bindBarcode", getBindBarcode())
|
||||
.append("createBy", getCreateBy())
|
||||
.append("createTime", getCreateTime())
|
||||
.toString();
|
||||
}
|
||||
}
|
||||
@ -1,88 +1,88 @@
|
||||
package com.hw.mes.domain;
|
||||
|
||||
import org.apache.commons.lang3.builder.ToStringBuilder;
|
||||
import org.apache.commons.lang3.builder.ToStringStyle;
|
||||
import com.hw.common.core.annotation.Excel;
|
||||
import com.hw.common.core.web.domain.BaseEntity;
|
||||
|
||||
/**
|
||||
* 绑定条码对象 mes_base_bind_barcode
|
||||
*
|
||||
* @author Open Platform
|
||||
* @date 2024-09-25
|
||||
*/
|
||||
public class MesBaseBindBarcode extends BaseEntity
|
||||
{
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/** 主键 */
|
||||
private Long bindBarcodeId;
|
||||
|
||||
/** 条码ID */
|
||||
@Excel(name = "条码ID")
|
||||
private Long barcodeId;
|
||||
|
||||
private String barcodeInfo;
|
||||
|
||||
private Long saleOrderId;
|
||||
|
||||
/** 绑定的条码内容 */
|
||||
@Excel(name = "绑定的条码内容")
|
||||
private String bindBarcode;
|
||||
|
||||
public void setBindBarcodeId(Long bindBarcodeId)
|
||||
{
|
||||
this.bindBarcodeId = bindBarcodeId;
|
||||
}
|
||||
|
||||
public Long getBindBarcodeId()
|
||||
{
|
||||
return bindBarcodeId;
|
||||
}
|
||||
public void setBarcodeId(Long barcodeId)
|
||||
{
|
||||
this.barcodeId = barcodeId;
|
||||
}
|
||||
|
||||
public Long getBarcodeId()
|
||||
{
|
||||
return barcodeId;
|
||||
}
|
||||
|
||||
public String getBarcodeInfo() {
|
||||
return barcodeInfo;
|
||||
}
|
||||
|
||||
public void setBarcodeInfo(String barcodeInfo) {
|
||||
this.barcodeInfo = barcodeInfo;
|
||||
}
|
||||
|
||||
public Long getSaleOrderId() {
|
||||
return saleOrderId;
|
||||
}
|
||||
|
||||
public void setSaleOrderId(Long saleOrderId) {
|
||||
this.saleOrderId = saleOrderId;
|
||||
}
|
||||
|
||||
public void setBindBarcode(String bindBarcode)
|
||||
{
|
||||
this.bindBarcode = bindBarcode;
|
||||
}
|
||||
|
||||
public String getBindBarcode()
|
||||
{
|
||||
return bindBarcode;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
|
||||
.append("bindBarcodeId", getBindBarcodeId())
|
||||
.append("barcodeId", getBarcodeId())
|
||||
.append("bindBarcode", getBindBarcode())
|
||||
.append("createBy", getCreateBy())
|
||||
.append("createTime", getCreateTime())
|
||||
.toString();
|
||||
}
|
||||
}
|
||||
//package com.hw.mes.domain;
|
||||
//
|
||||
//import org.apache.commons.lang3.builder.ToStringBuilder;
|
||||
//import org.apache.commons.lang3.builder.ToStringStyle;
|
||||
//import com.hw.common.core.annotation.Excel;
|
||||
//import com.hw.common.core.web.domain.BaseEntity;
|
||||
//
|
||||
///**
|
||||
// * 绑定条码对象 mes_base_bind_barcode
|
||||
// *
|
||||
// * @author Open Platform
|
||||
// * @date 2024-09-25
|
||||
// */
|
||||
//public class MesBaseBindBarcode extends BaseEntity
|
||||
//{
|
||||
// private static final long serialVersionUID = 1L;
|
||||
//
|
||||
// /** 主键 */
|
||||
// private Long bindBarcodeId;
|
||||
//
|
||||
// /** 条码ID */
|
||||
// @Excel(name = "条码ID")
|
||||
// private Long barcodeId;
|
||||
//
|
||||
// private String barcodeInfo;
|
||||
//
|
||||
// private Long saleOrderId;
|
||||
//
|
||||
// /** 绑定的条码内容 */
|
||||
// @Excel(name = "绑定的条码内容")
|
||||
// private String bindBarcode;
|
||||
//
|
||||
// public void setBindBarcodeId(Long bindBarcodeId)
|
||||
// {
|
||||
// this.bindBarcodeId = bindBarcodeId;
|
||||
// }
|
||||
//
|
||||
// public Long getBindBarcodeId()
|
||||
// {
|
||||
// return bindBarcodeId;
|
||||
// }
|
||||
// public void setBarcodeId(Long barcodeId)
|
||||
// {
|
||||
// this.barcodeId = barcodeId;
|
||||
// }
|
||||
//
|
||||
// public Long getBarcodeId()
|
||||
// {
|
||||
// return barcodeId;
|
||||
// }
|
||||
//
|
||||
// public String getBarcodeInfo() {
|
||||
// return barcodeInfo;
|
||||
// }
|
||||
//
|
||||
// public void setBarcodeInfo(String barcodeInfo) {
|
||||
// this.barcodeInfo = barcodeInfo;
|
||||
// }
|
||||
//
|
||||
// public Long getSaleOrderId() {
|
||||
// return saleOrderId;
|
||||
// }
|
||||
//
|
||||
// public void setSaleOrderId(Long saleOrderId) {
|
||||
// this.saleOrderId = saleOrderId;
|
||||
// }
|
||||
//
|
||||
// public void setBindBarcode(String bindBarcode)
|
||||
// {
|
||||
// this.bindBarcode = bindBarcode;
|
||||
// }
|
||||
//
|
||||
// public String getBindBarcode()
|
||||
// {
|
||||
// return bindBarcode;
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public String toString() {
|
||||
// return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
|
||||
// .append("bindBarcodeId", getBindBarcodeId())
|
||||
// .append("barcodeId", getBarcodeId())
|
||||
// .append("bindBarcode", getBindBarcode())
|
||||
// .append("createBy", getCreateBy())
|
||||
// .append("createTime", getCreateTime())
|
||||
// .toString();
|
||||
// }
|
||||
//}
|
||||
|
||||
Loading…
Reference in New Issue