I3_YF_SEAT
/
i3plus-pojo
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

解决冲突

Browse Source
yun-zuoyi
WYnneaoapc 6 years ago
parent fdd051f2dd a55795d43f
commit 12a66262be
10 changed files with 101 additions and 11 deletions
Show Stats Download Patch File Download Diff File

11
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java
Unescape Escape View File

@ -100,11 +100,20 @@ public class MesPackage extends BaseBean {
private String printStrStatus;
@Transient
@ApiParam("客户代码名称")
private String custCodeName;
@Transient
@ApiParam("打印缓存id")
private String printId;
@Transient
@ApiParam("包装层级名称")
private String packLevelName;
@Transient
@ApiParam("是否封箱名称")
private String isSealedName;
public MesPackage() {
}

8
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java
Unescape Escape View File

@ -24,7 +24,7 @@ import javax.persistence.Table;
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PACKAGE_DETAIL")
@Api("包装规格")
@Api("包装规格明细")
public class MesPackageDetail extends BaseBean {
@Column(name = "PACKAGE_NO")
@ -32,15 +32,15 @@ public class MesPackageDetail extends BaseBean {
private String packageNo;
@Column(name = "SERIAL_NUMBER")
@ApiParam("产品条码")
@ApiParam("过程条码")
private String serialNumber;
@Column(name = "PART_NO")
@ApiParam("产品条码")
@ApiParam("物料编号")
private String partNo;
@Column(name = "PART_NAME_RDD")
@ApiParam("产品条码")
@ApiParam("物料名称")
private String partNameRdd;
@Column(name = "PACKAGE_NO2")

18
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProdPackageModel.java
Unescape Escape View File

@ -58,10 +58,28 @@ public class ProdPackageModel {
@ApiParam("包装规格")
private String packSpec;
@ApiParam("数量")
private Double qty;
@ApiParam("特殊批次")
private String fixLotNo;
@ApiParam("包装集合")
private List<MesPackage> packageList;
@ApiParam("工单集合")
private List<MesWorkOrder> workOrderList;
@ApiParam("打印状态文字")
private String printStrStatus;
@ApiParam("客户代码名称")
private String custCodeName;
@ApiParam("包装层级名称")
private String packLevelName;
@ApiParam("是否封箱名称")
private String isSealedName;
}

16
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java
Unescape Escape View File

@ -95,4 +95,20 @@ public class MesPackage extends BaseBean {
@ApiParam("封箱状态")
private String sealStatus;
@Transient
@ApiParam("打印状态文字")
private String printStrStatus;
@Transient
@ApiParam("客户代码名称")
private String custCodeName;
@Transient
@ApiParam("包装层级名称")
private String packLevelName;
@Transient
@ApiParam("是否封箱名称")
private String isSealedName;
}

6
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java
Unescape Escape View File

@ -23,8 +23,8 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PACKAGE")
@Api("包装规格")
@Table(name = "MES_PACKAGE_DETAIL")
@Api("包装规格明细")
public class MesPackageDetail extends BaseBean {
@Column(name = "PACKAGE_NO")
@ -32,7 +32,7 @@ public class MesPackageDetail extends BaseBean {
private String packageNo;
@Column(name = "SERIAL_NUMBER")
@ApiParam("产品条码")
@ApiParam("过程条码")
private String serialNumber;
@Column(name = "PART_NO")

2
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SwebProcurementPlanOrder.java
Unescape Escape View File

@ -51,6 +51,6 @@ public class SwebProcurementPlanOrder extends BaseBean {
@Column(name = "CONSIGNMENT")
@ApiParam(value = "是否寄售")
private Integer consignment;
private Integer consignment=2;
}

4
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java
Unescape Escape View File

@ -179,6 +179,10 @@ public class WmsMoveToERP extends BaseBean {
@ApiParam("是否寄售")
public Integer isConsignment = 2;
@Column(name = "PRIOR_RC")
@ApiParam("是否预收货")
public Integer priorRC = 2;
@ApiParam(value = "待出库数量", example = "0")
@Transient
private Long waitingCounts;

2
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java
Unescape Escape View File

@ -116,7 +116,7 @@ public class WmsPOMaster extends BaseBean {
@ApiParam("集装箱号")
public String containerNo;
@Column(name = "PRIOR_RC")
@Column(name = "PRIOR_RC",columnDefinition = "int default 2")
@ApiParam("预收货")
public Integer priorRC;

33
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java
Unescape Escape View File

@ -329,4 +329,37 @@ public class WmsStockSn extends BaseBean {
this.lotNo = lotNo;
this.qty = qty;
}
public WmsStockSn(String sn, String partNo, String partNameRdd, String unit, Integer snStatus,
Integer qcStatus, Double qty, String locateNo, String zoneNo, String whNo, String lotNo,
String dateCode, String leftCode, String fixLotNo, String vendorNo, String vendorNameRdd,
String qualityDate, String custNo, String lotCheckRule, String sn2d,
String packageNo, String createDatetime, String createUser, String modifyDatetime, String modifyUser) {
this.sn = sn;
this.partNo = partNo;
this.partNameRdd = partNameRdd;
this.unit = unit;
this.snStatus = snStatus;
this.qcStatus = qcStatus;
this.qty = qty;
this.locateNo = locateNo;
this.zoneNo = zoneNo;
this.whNo = whNo;
this.lotNo = lotNo;
this.dateCode = dateCode;
this.leftCode = leftCode;
this.fixLotNo = fixLotNo;
this.vendorNo = vendorNo;
this.vendorNameRdd = vendorNameRdd;
this.qualityDate = qualityDate;
this.qualityDay = qualityDay;
this.custNo = custNo;
this.lotCheckRule = lotCheckRule;
this.sn2d = sn2d;
this.packageNo = packageNo;
this.createDatetime = createDatetime;
this.createUser = createUser;
this.modifyDatetime = modifyDatetime;
this.modifyUser = modifyUser;
}
}

12
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
Unescape Escape View File

@ -208,6 +208,16 @@ public class WmsHqlPack {
DdlPreparedPack.getStringEqualPack(wmsPOMaster.getVendorNo(), "vendorNo", result);
DdlPreparedPack.getStringEqualPack(wmsPOMaster.getSrc(), "src", result);
DdlPreparedPack.getStringEqualPack(wmsPOMaster.getIsAsn(), "isAsn", result);
if (wmsPOMaster.getPriorRC()!=null&&wmsPOMaster.getPriorRC()==WmsEnumUtil.TRUE_OR_FALSE.FALSE.getValue()){
ArrayList<Integer> numList = new ArrayList<>();
numList.add(0);
numList.add(wmsPOMaster.getPriorRC());
numList.add(null);
DdlPreparedPack.getInPackList(numList, "priorRC", result);
}else{
DdlPreparedPack.getNumEqualPack(wmsPOMaster.getPriorRC(), "priorRC", result);
}
// 查询计划时间在指定范围的单号，查询这些单号的数据
if (StringUtils.isNotBlank(wmsPOMaster.getPlanDateStart()) && StringUtils.isNotBlank(wmsPOMaster.getPlanDateEnd())) {
@ -1510,7 +1520,7 @@ public class WmsHqlPack {
//查询参数封装
DdlPreparedPack.getStringEqualPack(wmsPoSn.getOrderNo(), "orderNo", result);
DdlPreparedPack.getStringEqualPack(wmsPoSn.getSn(), "sn", result);
DdlPreparedPack.getStringEqualPack(wmsPoSn.getSn(), "snOneBarCode", result);
DdlPreparedPack.getStringEqualPack(wmsPoSn.getPartNo(), "partNo", result);
DdlPreparedPack.getNumEqualPack(wmsPoSn.getQcStatus(), "qcStatus", result);
DdlPreparedPack.getStringLikerPack(wmsPoSn.getErpAreaNoAdd(), "erpAreaNoAdd", result);

Write Preview
Loading…
Cancel
Save