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

Merge branch 'test'

Browse Source
yun-zuoyi
WYnneaoapc 5 years ago
parent 7ecae4d56b 0191a17a4d
commit 51623754c7
21 changed files with 196 additions and 17 deletions
Show Stats Download Patch File Download Diff File

3
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
Unescape Escape View File

@ -3568,7 +3568,8 @@ public class MesEnumUtil {
PCN_LOGIN(160, "PCN_LOGIN", ""),
PCN_MENU(170, "PCN_MENU", ""),
PCN_MODULE(180, "PCN_MODULE", ""),
PCN_LOGOUT(190, "PCN_LOGOUT", "");
PCN_LOGOUT(190, "PCN_LOGOUT", ""),
UPDATE_LOCALE_RES(200, "SYNC_DATA_URL", "LOCALE_RES_URL");
private int value;

9
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
Unescape Escape View File

@ -131,7 +131,8 @@ public class MesPcnEnumUtil {
PCN_LOGIN(160, "PCN_LOGIN", ""),
PCN_MENU(170, "PCN_MENU", ""),
PCN_MODULE(180, "PCN_MODULE", ""),
PCN_LOGOUT(190, "PCN_LOGOUT", "");
PCN_LOGOUT(190, "PCN_LOGOUT", ""),
UPDATE_LOCALE_RES(200, "LOCALE_RES_URL", "LOCALE_RES_URL");
private int value;
@ -214,6 +215,7 @@ public class MesPcnEnumUtil {
}
}
/**
* MES_TYPE_CFG 类型信息
*/
@ -253,6 +255,7 @@ public class MesPcnEnumUtil {
return tmp;
}
}
/**
* MesProdBindRecord 是否是关键件
*/
@ -2097,6 +2100,9 @@ public class MesPcnEnumUtil {
NEVER(-1, "不过期"),
ONE_HOUR(3600, "一小时"),
FIVE_MINS(300, "5分钟"),
HALF_HOUR(1800, "半小时"),
ONE_QUARTER(900, "一刻钟"),
ONE_MIN(60, "一分钟");
private int value;
@ -2433,7 +2439,6 @@ public class MesPcnEnumUtil {
}
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ONLINE_SEND_TYPE {

45
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
Unescape Escape View File

@ -925,8 +925,8 @@ public class WmsEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum TASK_INFO_STATUS {
CREATE(10, 10, "创建"), FINISH(20, 20, "处理中"),
FAIL(30, 30, "已处理"), CLOSE(40, 40, "已关闭");
CREATE(10, 10, "创建"), HANDLEING(20, 20, "处理中"),
FINISH(30, 30, "已处理"), CLOSE(40, 40, "已关闭");
private int value;
private int code;
@ -981,7 +981,6 @@ public class WmsEnumUtil {
/**
* 业务表：库存条码状态
* 10=创建，20=质检中，30=待入库，40=入库，50=配料，60=出库，70=报废，80=在途
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum STOCK_SN_STATUS {
@ -991,7 +990,7 @@ public class WmsEnumUtil {
INSTOCKED(40, "入库"),
PICKED(50, "配料"),
OUT_STOCK(60, "出库"),
//SCRAP(70, "报废"),
SCRAP(70,"报废"),
COMMING(80, "在途");
private int value;
@ -4656,7 +4655,7 @@ public class WmsEnumUtil {
}
/**
* 计划拉动明细表状态创建
* 计划拉动主表状态创建
* 默认为 10
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
@ -4709,4 +4708,40 @@ public class WmsEnumUtil {
}
}
/**
* 计划拉动明细表状态创建
* 默认为 10
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum VENDOR_TYPE {
VENDOR(10, "供应商"), CARRIERS(20, "承运商");
private int value;
private String description;
VENDOR_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
}
}

2
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDefectRecordRepositoty.java → modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDefectRecordRepository.java
Unescape Escape View File

@ -12,5 +12,5 @@ import org.springframework.stereotype.Repository;
* @Modify:
**/
@Repository
public interface MesDefectRecordRepositoty extends BaseRepository<MesDefectRecord, Long> {
public interface MesDefectRecordRepository extends BaseRepository<MesDefectRecord, Long> {
}

2
modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java
Unescape Escape View File

@ -48,7 +48,9 @@ public class SuitClientModel {
/**
* 适配结果信息
*/
@XStreamCDATA
private String suitMessage;
/**
* 请求来源
*/

2
modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java
Unescape Escape View File

@ -4,7 +4,6 @@ import cn.estsh.i3plus.pojo.base.annotation.XStreamCDATA;
import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitRecord;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import com.thoughtworks.xstream.annotations.XStreamImplicit;
import com.thoughtworks.xstream.annotations.XStreamOmitField;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -44,6 +43,7 @@ public class SuitServerModel {
* 适配结果信息
*/
// @XStreamImplicit
@XStreamCDATA
private String suitMessage;
/**

24
modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsCSOrderMasterModel.java
Unescape Escape View File

@ -0,0 +1,24 @@
package cn.estsh.i3plus.pojo.model.wms;
import cn.estsh.i3plus.pojo.wms.bean.WmsCSOrderMaster;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
/**
* 盘点批量操作
* @author qianhs
*/
@Data
public class WmsCSOrderMasterModel implements Serializable {
private static final long serialVersionUID = -5490167040159056107L;
@ApiParam("盘点订单主表")
public List<WmsCSOrderMaster> wmsCSOrderMasterList;
@ApiParam("工厂代码")
public String organizeCode;
}

36
modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java
Unescape Escape View File

@ -0,0 +1,36 @@
package cn.estsh.i3plus.pojo.model.wms;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.util.List;
import java.util.Map;
/**
* @Description : 条码FIFO推荐
* @Reference :
* @Author : jimmy.zeng
* @CreateDate : 2019-12-17 20:41
* @Modify:
**/
@Data
public class WmsStockFifoModel {
@ApiParam(value = "工厂代码")
String organizeCode;
@ApiParam(value = "物料集合")
List<String> partNos;
@ApiParam(value = "存储区集合")
List<String> zoneNos;
@ApiParam(value = "物料对应的存储区")
Map<String, String> partToZoneMap;
@ApiParam(value = "单据号")
String orderNo;
@ApiParam(value = "物料对应的存储区集合")
Map<String,List<String>> partToZonesMap;
}

3
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java
Unescape Escape View File

@ -54,6 +54,9 @@ public class SessionUser implements Serializable {
@ApiParam("列表默认分页数量")
private Integer pageDefaultSize;
@ApiParam("文件展示地址")
private String fileViewUrl;
public SessionUser() {
}

3
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java
Unescape Escape View File

@ -81,9 +81,10 @@ public class CoreHqlPack {
if(resource != null){
DdlPreparedPack.getNumEqualPack(resource.getResourceType(),"resourceType",result);
DdlPreparedPack.getNumEqualPack(resource.getSoftType(),"softType",result);
DdlPreparedPack.getNumEqualPack(resource.getIsSystem(),"isSystem",result);
DdlPreparedPack.getStringEqualPack(resource.getLanguageCode(),"languageCode",result);
DdlPreparedPack.getStringEqualPack(resource.getResourceKey(),"resourceKey",result);
DdlPreparedPack.getStringLikerPack(resource.getResourceKey(),"resourceKey",result);
DdlPreparedPack.getStringLikerPack(resource.getResourceValue(),"resourceValue",result);
}

13
modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java
Unescape Escape View File

@ -98,6 +98,19 @@ public class BsSuitRecord extends BaseBean {
@ApiParam(value = "适配结果")
private Integer suitResult;
@Column(name = "SUIT_START_DATE_TIME")
@ApiParam(value = "适配开始时间")
private String suitStartTime;
@Column(name = "SUIT_END_DATE_TIME")
@ApiParam(value = "适配结束时间")
private String suitEndTime;
@Column(name = "EXECUTE_TIME")
@ApiParam(value = "执行耗时")
@JsonSerialize(using = ToStringSerializer.class)
private Long executeTime;
@Lob
@Column(name = "SUIT_MESSAGE")
@ApiParam(value = "适配信息")

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

@ -112,6 +112,7 @@ public class WmsActionGroupDetails extends BaseBean {
@Column(name = "IS_AUTO_OPEN_WINDOW",nullable = false)
@ApiParam(value = "是否自动开窗")
@AnnoOutputColumn
private Integer isAutoOpenWindow;
@Column(name = "SEARCH_KEY", columnDefinition = "varchar(225) default ''")

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

@ -119,6 +119,19 @@ public class WmsCSFactTrans extends BaseBean {
@ApiParam(value = "物料数量", example = "1")
public Double sumPartQty;
/**
* 条码状态:1=创建,10=已收货,20=已质检,
* 30=已入库,40=待出库,50=已出库,
* 60=在途,70=已隔离,80=破包,90=冻结,100=作废
*/
@Transient
@ApiParam(value = "条码状态", example = "1")
public Integer snStatus;
@Transient
@ApiParam(value = "条码状态(冻结时)", example = "1")
public Integer destSnStatus;
@Transient
@ApiParam("存储区编号组")
public String[] zoneNos;

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

@ -93,6 +93,11 @@ public class WmsCSOrderDetails extends BaseBean {
@AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class,refForeignKey = "value",value = "description")
public Integer snStatus;
@Column(name = "DEST_SN_STATUS")
@ApiParam(value = "条码状态(冻结时)", example = "1")
@AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class,refForeignKey = "value",value = "description")
public Integer destSnStatus;
/**
* 处理状态:10=已创建,20=已盘,30=已冻结,40=已解冻,50=取消冻结
*/

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

@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.*;
import java.util.Objects;
/**
* @Description :移库单明细实体(用于转储类业务)
@ -205,6 +206,10 @@ public class WmsDocMovementDetails extends BaseBean {
@AnnoOutputColumn(refClass = WmsEnumUtil.PRINT_STATUS.class, refForeignKey = "value", value = "description")
private Integer printStatus;
@Transient
@ApiParam("优先级")
private String priority;
public String getRecommondLot() {
return recommondLot == null ? "无" : this.recommondLot;
}
@ -254,4 +259,17 @@ public class WmsDocMovementDetails extends BaseBean {
@Column(name = "IS_SN")
@ApiParam(value = "条码生成状态", example = "20")
public Integer isSn;
public WmsDocMovementDetails () {
}
public WmsDocMovementDetails (String orderNo, String srcZoneNo, String destZoneNo, String destLocateNo) {
this.orderNo = orderNo;
this.srcZoneNo = srcZoneNo;
this.destZoneNo = destZoneNo;
this.destLocateNo = destLocateNo;
}
}

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

@ -32,7 +32,7 @@ public class WmsPullTaskDetails extends BaseBean{
@Column(name="WROKORDER_NO")
@ApiParam("工单号")
private String wrokorderNo;
private String woekorderNo;
@Column(name="ITEM")
@ApiParam(value = "行号", example = "0")
@ -107,7 +107,7 @@ public class WmsPullTaskDetails extends BaseBean{
private Double bootLotNo = 0d;
@Column(name="ORDER_STATUS")
@ApiParam(value = "单据状态", example = "0")
@ApiParam(value = "明细状态", example = "0")
private Integer orderStatus = 0;
public Integer getOrderStatus() {

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

@ -53,8 +53,6 @@ public class WmsRouting extends BaseBean {
@Column(name = "FOR_PRODUCT")
@ApiParam(value = "适用产品")
private Integer forProduct;
@Transient

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

@ -109,6 +109,10 @@ public class WmsTmsShippingExt extends BaseBean {
@ApiParam("关联单号")
private String refOrderNo;
@Column(name="PATH_URL")
@ApiParam("回执单地址")
private String pathUrl;
@Transient
@ApiParam("打印模板列表")
private List<WmsTmsShipModel> shipModels;

3
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java
Unescape Escape View File

@ -58,4 +58,7 @@ public class WmsTmsShipDto extends BaseDto implements Serializable {
@ApiParam(value ="车牌号RDD")
private String carNo;
@ApiParam("回执单地址")
private String pathUrl;
}

6
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipModel.java
Unescape Escape View File

@ -23,4 +23,10 @@ public class WmsTmsShipModel {
private Double recQty;
@ApiParam("单位")
private String unit;
@ApiParam("序号")
private Integer item;
@ApiParam("装车时间")
private String modifyDatetime;
}

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

@ -2618,7 +2618,18 @@ public class WmsHqlPack {
*/
public static DdlPackBean packHqlWmsPullTaskMaster(WmsPullTaskMaster wmsPullTaskMaster,String statusList) {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getInPack(statusList, "orderStatus", result);
List<String> stringList = null;
List<Integer> integerList = null;
//List<Integer> integers = Arrays.stream(statusList.split(",")).map(Integer::parseInt).collect(Collectors.toList());
if(StringUtils.isNotBlank(statusList)){
stringList = Arrays.asList(statusList.split(","));
integerList = new ArrayList<>();
for(String sl : stringList){
integerList.add(Integer.valueOf(sl));
}
}
DdlPreparedPack.getInPackList(integerList, "orderStatus", result);
DdlPreparedPack.getStringLikerPack(wmsPullTaskMaster.getWoekorderNo(), "woekorderNo", result);
DdlPreparedPack.getStringEqualPack(wmsPullTaskMaster.getPdlineNo(), "pdlineNo", result);
DdlPreparedPack.getStringBiggerPack(wmsPullTaskMaster.getStartProductTime(), "startProductTime", result);
@ -2637,7 +2648,7 @@ public class WmsHqlPack {
*/
public static DdlPackBean packHqlWmsPullTaskDetails(WmsPullTaskDetails wmsPullTaskDetails) {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringLikerPack(wmsPullTaskDetails.getWrokorderNo(), "wrokorderNo", result);
DdlPreparedPack.getStringLikerPack(wmsPullTaskDetails.getWoekorderNo(), "woekorderNo", result);
DdlPreparedPack.getStringLikerPack(wmsPullTaskDetails.getPartNo(), "partNo", result);
getStringBuilderPack(wmsPullTaskDetails, result);

Write Preview
Loading…
Cancel
Save