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

Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

Browse Source
yun-zuoyi
刘敏 6 years ago
parent 8c4646bc41 f6bc967e07
commit c6b24ea3cc
7 changed files with 101 additions and 34 deletions
Show Stats Download Patch File Download Diff File

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

@ -492,9 +492,9 @@ public class WmsEnumUtil {
OUTSOURCING_BACK(140, "OUTSOURCING_BACK", "委外退回"),
NC_WAREHOSING_OUT(150, "NC_WAREHOSING_OUT", "NC出库"),
SUPPLIER_RETURN_SMRR(190, "SUPPLIER_RETURN_SMRR", "供应商退货(SMRR)"),
NC_DISMANTLING_PICKING(160,"NC_DISMANTLING_PICKING","NC拆解领料"),
NC_DISMANTLING_RETREAT(170,"NC_DISMANTLING_RETREAT","NC拆解退料"),
LINE_EDGE_SCRAPPING_OUT(180,"LINE_EDGE_SCRAPPING_OUT","线边报废出库");
NC_DISMANTLING_PICKING(160, "NC_DISMANTLING_PICKING", "NC拆解领料"),
NC_DISMANTLING_RETREAT(170, "NC_DISMANTLING_RETREAT", "NC拆解退料"),
LINE_EDGE_SCRAPPING_OUT(180, "LINE_EDGE_SCRAPPING_OUT", "线边报废出库");
private int value;
@ -851,7 +851,7 @@ public class WmsEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum STOCK_SN_QC_STATUS {
NORMAL(10, "EMPTY", "合格"), ABNORMAL(20, "ABNORMAL", "不合格"), ISOLATED(30, "ISOLATED", "隔离"), FRAZE(40,"ISOLATED", "报废");
NORMAL(10, "EMPTY", "合格"), ABNORMAL(20, "ABNORMAL", "不合格"), ISOLATED(30, "ISOLATED", "隔离"), FRAZE(40, "ISOLATED", "报废");
private int value;
private String code;
@ -896,10 +896,13 @@ public class WmsEnumUtil {
}
public static STOCK_SN_QC_STATUS codeOf(Integer value) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == value) {
return values()[i];
if (value == null) {
return null;
} else {
for (int i = 0; i < values().length; i++) {
if (values()[i].value == value) {
return values()[i];
}
}
}
return null;
@ -919,7 +922,7 @@ public class WmsEnumUtil {
private int value;
private String description;
CS_ORDER_TYPE(int value,String description) {
CS_ORDER_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
@ -948,12 +951,12 @@ public class WmsEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum CS_ORDER_STATUS {
CREATE(10,"CREATE", "创建"),
STARTING_INVENTORY(20,"STARTING_INVENTORY", "开启盘点"),
IN_INVENTORY(30,"IN_INVENTORY", "盘点中"),
INVENTORY_FINISH(40,"INVENTORY_FINISH", "盘点完成"),
THAWING(50,"THAWING", "已解冻"),
CLOSED(60, "CLOSED","已关闭");
CREATE(10, "CREATE", "创建"),
STARTING_INVENTORY(20, "STARTING_INVENTORY", "开启盘点"),
IN_INVENTORY(30, "IN_INVENTORY", "盘点中"),
INVENTORY_FINISH(40, "INVENTORY_FINISH", "盘点完成"),
THAWING(50, "THAWING", "已解冻"),
CLOSED(60, "CLOSED", "已关闭");
private int value;
private String code;
@ -1725,7 +1728,7 @@ public class WmsEnumUtil {
ZONE(20, "ZONE", "存储区对象"),
LOCATE(30, "LOCATE", "库位对象"),
MATERIAL(40, "MATERIAL", "物料对象"),
TRANS_TYPE(50,"TRANS_TYPE","交易代码对象");
TRANS_TYPE(50, "TRANS_TYPE", "交易代码对象");
private String code;
private String description;
@ -2476,12 +2479,12 @@ public class WmsEnumUtil {
}
}
/**
/**
* 物料类型（用于物料）
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum WMS_PART_TYPE {
RAW_MATERIAL(1,"原材料"), PARTIALLY_PREPARED_PRODUCTS(2,"半成品"), FINISHED_PRODUCT(3,"成品");
RAW_MATERIAL(1, "原材料"), PARTIALLY_PREPARED_PRODUCTS(2, "半成品"), FINISHED_PRODUCT(3, "成品");
private int value;
private String description;

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

@ -56,4 +56,8 @@ public class WmsDataAuth extends BaseBean {
@ApiParam(value = "查询操作", example = "0")
private Integer queryOp;
@Column(name = "ROLE_NAME_RDD")
@ApiParam(value = "角色名称")
private String roleNameRdd;
}

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

@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
import org.springframework.format.annotation.DateTimeFormat;
import javax.persistence.*;
import java.math.BigDecimal;
import java.util.Date;
/**
@ -110,6 +111,7 @@ public class WmsStockSn extends BaseBean {
@ColumnDefault("0")
@ApiParam(value = "数量", example = "0")
private Double qty;
/**
* 质量状态:10=合格,20=不合格,30=隔离
*/
@ -206,7 +208,9 @@ public class WmsStockSn extends BaseBean {
this.partNo = partNo;
}
public Double getQty() {return qty == null ? 0L : this.qty.doubleValue(); }
public Double getQty() {
return qty == null ? 0L : qty.doubleValue();
}
public Double getInputNCQty(){return inputNCQty == null ? 0L : this.inputNCQty.doubleValue();}
}

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

@ -9,10 +9,7 @@ import org.hibernate.annotations.ColumnDefault;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Index;
import javax.persistence.Table;
import javax.persistence.*;
/**
* @Description : 库存交易条码信息 （移库类的交易需要记录2笔交易数据，正负各一笔）
@ -144,4 +141,16 @@ public class WmsTransQuan extends BaseBean {
@ColumnDefault("0")
@ApiParam(value = "报废数量", example = "0")
private Double scrapQty;
@Transient
@ApiParam("交易类型")
private String transTypeName;
@Transient
@ApiParam("仓库名称")
private String warehouseName;
@Transient
@ApiParam("存储区名称")
private String zoneName;
}

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

@ -66,4 +66,7 @@ public class WmsDataAuthModel extends BaseBean {
example = "0"
)
private Integer queryOp;
@ApiParam("角色名称")
private String roleNameRdd;
}

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

@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.wms.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.wms.bean.WmsTransQuan;
import org.springframework.stereotype.Repository;
/**
* @Description : 库存业务dao层
@ -10,5 +11,6 @@ import cn.estsh.i3plus.pojo.wms.bean.WmsTransQuan;
* @CreateDate : 2018-11-17 15:57
* @Modify:
**/
@Repository
public interface WmsTransQuanRepository extends BaseRepository<WmsTransQuan, Long> {
}

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

@ -1447,12 +1447,11 @@ public class WmsHqlPack {
*/
public static DdlPackBean packHqlWmsTaskDetail(Map<String, List<WmsDataAuth>> groupDataAuth, String refSrc, String organizeCode) {
DdlPackBean result = new DdlPackBean();
int i = 1;
Set<Map.Entry<String, List<WmsDataAuth>>> entries = groupDataAuth.entrySet();
//拼sql
entries.stream().filter(o -> !Strings.isNullOrEmpty(o.getKey()));
for (Map.Entry<String, List<WmsDataAuth>> map : entries) {
/*for (Map.Entry<String, List<WmsDataAuth>> map : entries) {
String key = map.getKey();
List<WmsDataAuth> valueList = map.getValue();
@ -1463,19 +1462,19 @@ public class WmsHqlPack {
List<Map> mapList = JSONObject.parseArray(data, Map.class);
if (StringUtils.equalsIgnoreCase(WmsEnumUtil.DATA_OBJ_TYPE.WAREHOUSE.getValue() + "", key)) {
DdlPreparedPack.getInPackList(cyclicTraversal(mapList,"WH_CODE"), "destWhNo", result);
//packMutilConditionHql(mapList, "WH_CODE", "destWhNo", result);
}/* else if (StringUtils.equalsIgnoreCase(WmsEnumUtil.DATA_OBJ_TYPE.LOCATE.getValue() + "", key)) {
packMutilConditionHql(mapList, "WH_CODE", "destWhNo", result);
} else if (StringUtils.equalsIgnoreCase(WmsEnumUtil.DATA_OBJ_TYPE.LOCATE.getValue() + "", key)) {
DdlPreparedPack.getInPackList(cyclicTraversal(mapList,"LOCATE_NO"), "destLocateNo", result);
//packMutilConditionHql(mapList, "LOCATE_NO", "destLocateNo", result);
}*/ else if (StringUtils.equalsIgnoreCase(WmsEnumUtil.DATA_OBJ_TYPE.ZONE.getValue() + "", key)) {
packMutilConditionHql(mapList, "LOCATE_NO", "destLocateNo", result);
} else if (StringUtils.equalsIgnoreCase(WmsEnumUtil.DATA_OBJ_TYPE.ZONE.getValue() + "", key)) {
DdlPreparedPack.getInPackList(cyclicTraversal(mapList,"ZONE_CODE"), "destZoneNo", result);
//packMutilConditionHql(mapList, "ZONE_CODE", "destZoneNo", result);
} /*else if (StringUtils.equalsIgnoreCase(WmsEnumUtil.DATA_OBJ_TYPE.MATERIAL.getValue() + "", key)) {
packMutilConditionHql(mapList, "ZONE_CODE", "destZoneNo", result);
} else if (StringUtils.equalsIgnoreCase(WmsEnumUtil.DATA_OBJ_TYPE.MATERIAL.getValue() + "", key)) {
DdlPreparedPack.getInPackList(cyclicTraversal(mapList,"PART_NO"), "partNo", result);
//packMutilConditionHql(mapList, "PART_NO", "partNo", result);
}*/
packMutilConditionHql(mapList, "PART_NO", "partNo", result);
}
}
}
}*/
//转换封装后的hql
/*String packedHql = result.getPackedHql();
@ -1957,4 +1956,47 @@ public class WmsHqlPack {
return result;
}
//库层交易报表packHqlWmsTransQuan
public static DdlPackBean packHqlWmsTransQuan(WmsTransQuan wmsTransQuan) {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(wmsTransQuan.getTransNo(), "transNo", result);
DdlPreparedPack.getStringEqualPack(wmsTransQuan.getWhNo(), "whNo", result);
DdlPreparedPack.getStringEqualPack(wmsTransQuan.getZoneNo(), "zoneNo", result);
DdlPreparedPack.getStringEqualPack(wmsTransQuan.getLocateNo(), "locateNo", result);
DdlPreparedPack.getStringEqualPack(wmsTransQuan.getPartNo(), "partNo", result);
DdlPreparedPack.getStringEqualPack(wmsTransQuan.getPartNameRdd(), "partNameRdd", result);
DdlPreparedPack.getStringEqualPack(wmsTransQuan.getUnit(), "unit", result);
DdlPreparedPack.getNumEqualPack(wmsTransQuan.getTransStatus(), "transStatus", result);
DdlPreparedPack.getStringEqualPack(wmsTransQuan.getRefSrc(), "refSrc", result);
DdlPreparedPack.getStringEqualPack(wmsTransQuan.getRefType(), "refType", result);
DdlPreparedPack.getNumEqualPack(wmsTransQuan.getBusiType(), "busiType", result);
DdlPreparedPack.getStringEqualPack(wmsTransQuan.getTransCode(), "transCode", result);
DdlPreparedPack.getStringEqualPack(wmsTransQuan.getMoveNo(), "moveNo", result);
DdlPreparedPack.getStringEqualPack(wmsTransQuan.getVendorNo(), "vendorNo", result);
DdlPreparedPack.getStringEqualPack(wmsTransQuan.getCustNo(), "custNo", result);
DdlPreparedPack.getStringEqualPack(wmsTransQuan.getErrorMessage(), "errorMessage", result);
// DdlPreparedPack.getStringEqualPack(wmsTransQuan.getQty().toString(), "qty", result);
// DdlPreparedPack.getStringEqualPack(wmsTransQuan.getFailQty().toString(), "failQty", result);
// DdlPreparedPack.getStringEqualPack(wmsTransQuan.getHoldQty().toString(), "holdQty", result);
// DdlPreparedPack.getStringEqualPack(wmsTransQuan.getQcQty().toString(), "qcQty", result);
// DdlPreparedPack.getStringEqualPack(wmsTransQuan.getRinQty().toString(), "rinQty", result);
// DdlPreparedPack.getStringEqualPack(wmsTransQuan.getFreezeQty().toString(), "freezeQty", result);
// DdlPreparedPack.getStringEqualPack(wmsTransQuan.getConsignQty().toString(), "consignQty", result);
// DdlPreparedPack.getStringEqualPack(wmsTransQuan.getLockQty().toString(), "lockQty", result);
// DdlPreparedPack.getStringEqualPack(wmsTransQuan.getTransNo(), "scrapQty", result);
// DdlPreparedPack.getStringEqualPack(wmsTransQuan.getScrapQty().toString(), "transTypeName", result);
// DdlPreparedPack.getStringEqualPack(wmsTransQuan.getWarehouseName(), "warehouseName", result);
// DdlPreparedPack.getStringEqualPack(wmsTransQuan.getZoneName(), "zoneName", result);
//
getStringBuilderPack(wmsTransQuan, result);
return result;
}
}

Write Preview
Loading…
Cancel
Save