yun-zuoyi
sky.meng 6 years ago
commit 78c8d3b689

@ -127,8 +127,8 @@ public class AndonHqlPack {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(andonAlarmCause.getAcCode(),"acCode", result);
// DdlPreparedPack.getStringEqualPack(andonAlarmCause.getAcName(),"acName", result);
// DdlPreparedPack.getStringEqualPack(andonAlarmCause.getAlarmCode(), "alarmCode", result);
DdlPreparedPack.getStringEqualPack(andonAlarmCause.getAcName(),"acName", result);
DdlPreparedPack.getStringEqualPack(andonAlarmCause.getAlarmCode(), "alarmCode", result);
getStringBuilderPack(andonAlarmCause, result);
return result;
@ -394,7 +394,7 @@ public class AndonHqlPack {
public static DdlPackBean packAndonAlarmDetailType(AndonAlarmDetailType andonAlarmDetailType) {
DdlPackBean result = new DdlPackBean();
// DdlPreparedPack.getStringEqualPack(andonAlarmDetailType.getAlarmCode(), "alarmCode", result);
DdlPreparedPack.getStringEqualPack(andonAlarmDetailType.getAlarmCode(), "alarmCode", result);
DdlPreparedPack.getStringEqualPack(andonAlarmDetailType.getAlarmDetailCode(), "alarmDetailCode", result);
getStringBuilderPack(andonAlarmDetailType, result);

@ -246,7 +246,8 @@ public class AndonEnumUtil {
QUALITY("QUALITY_ALARM","质量"),
EQUIP("EQUMENT_ALARM","设备"),
PROCESS("ROUTING_ALARM","工艺"),
CHECK("OTHER_ALARM","其他");
CHECK("OTHER_ALARM","其他"),
FIX_ERROR("FIX_ERROR", "设备故障");
private String value;
private String description;

@ -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;

@ -0,0 +1,19 @@
package cn.estsh.i3plus.pojo.model.common;
import lombok.Data;
/**
* @Description :
* @Reference :
* @Author : yunhao
* @CreateDate : 2019-06-20 18:50
* @Modify:
**/
@Data
public class ExportDataModel {
private String className;
private String exportData;
}

@ -26,7 +26,7 @@ public class SapAsn extends SapBase {
@ApiParam(value = "ASN item")
@AnnoOutputColumn
private Double zrnum;
private Integer zrnum;
@ApiParam(value = "物料编码")
@AnnoOutputColumn

@ -23,7 +23,7 @@ public class SapBase {
private String actusr = "导入";
@ApiParam(value = "SID", example = "-1")
private String sid = new Random().nextInt() + "";
private String sid = ( Math.abs(new Random().nextInt())+ "");
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiParam(value = "接收数据日期", example = "-1")
@ -55,7 +55,7 @@ public class SapBase {
private String staflg = "Y";
@ApiParam(value = "顺序号", example = "-1")
private Integer seq = new Random().nextInt();
private Integer seq = 1;
@ApiParam(value = "GUID", example = "-1")
private String guid = UUID.randomUUID().toString();

@ -22,7 +22,7 @@ public class SapMiscr extends SapBase{
@ApiParam(value = "行号",example = "1")
@AnnoOutputColumn
private Double zeile;
private Integer zeile;
@ApiParam(value = "工厂",example = "1")
@AnnoOutputColumn
@ -64,8 +64,8 @@ public class SapMiscr extends SapBase{
@AnnoOutputColumn(hidden = true)
private String sgtxt;
public Double getZeileVal() {
return zeile== null ? 0D : this.zeile.doubleValue();
public Integer getZeileVal() {
return zeile== null ? 0 : this.zeile.intValue();
}
public Double getErfmgVal() {

@ -0,0 +1,79 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
/**
* @Description :
* @Reference :
* @Author : amy
* @CreateDate : 2019-06-21 13:13
* @Modify:
**/
@Data
@Api(value="库存转储",description = "库存转储")
public class SapMovo extends SapBase{
@ApiParam(value = "编号",example = "1")
@AnnoOutputColumn
private String refid;
@ApiParam(value = "业务类型",example = "1")
@AnnoOutputColumn
private String action;
@ApiParam(value = "行号",example = "1")
@AnnoOutputColumn
private Integer zeile;
@ApiParam(value = "工厂",example = "1")
@AnnoOutputColumn
private String werks;
@ApiParam(value = "发出库存地点",example = "1")
@AnnoOutputColumn
private String lgort;
@ApiParam(value = "接收库存地点",example = "1")
@AnnoOutputColumn
private String umlgo;
@ApiParam(value = "物料编码",example = "1")
@AnnoOutputColumn
private String matnr;
@ApiParam(value = "旧物料编码(针对物料号切换)",example = "1")
@AnnoOutputColumn
private String ummat;
@ApiParam(value = "数量",example = "1")
@AnnoOutputColumn
private String erfmg;
@ApiParam(value = "计量单位",example = "1")
@AnnoOutputColumn
private String erfme;
@ApiParam(value = "库存状态",example = "1")
@AnnoOutputColumn
private String zstat;
@ApiParam(value = "特殊库存标识",example = "1")
@AnnoOutputColumn
private String sobkz;
@ApiParam(value = "特殊库存描述",example = "1")
@AnnoOutputColumn
private String htext;
@ApiParam(value = "状态",example = "1")
@AnnoOutputColumn
private String zzlzt;
@ApiParam(value = "不合格单据号",example = "1")
@AnnoOutputColumn
private String sgtxt;
}

@ -16,7 +16,7 @@ import lombok.Data;
@Api(value="销售退货",description = "销售退货")
public class SapRdn extends SapBase{
@ApiParam(value = "销售交货单",example = "1")
@ApiParam(value = "退货交货单",example = "1")
@AnnoOutputColumn
private String vbeln;

@ -0,0 +1,67 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
/**
* @Description :
* @Reference :
* @Author : amy
* @CreateDate : 2019-06-21 13:56
* @Modify:
**/
@Data
@Api(value="供应商退货",description = "供应商退货")
public class SapReto extends SapBase{
@ApiParam(value = "业务类型",example = "1")
@AnnoOutputColumn
private String zaction;
@ApiParam(value = "编号",example = "1")
@AnnoOutputColumn
private String zinstno;
@ApiParam(value = "行号",example = "1")
@AnnoOutputColumn
private String zeile;
@ApiParam(value = "供应商",example = "1")
@AnnoOutputColumn
private String lifnr;
@ApiParam(value = "工厂",example = "1")
@AnnoOutputColumn
private String umwrk;
@ApiParam(value = "物料编码",example = "1")
@AnnoOutputColumn
private String matnr;
@ApiParam(value = "库存地点",example = "1")
@AnnoOutputColumn
private String lgort;
@ApiParam(value = "退货数量",example = "1")
@AnnoOutputColumn
private String erfmg;
@ApiParam(value = "计量单位",example = "1")
@AnnoOutputColumn
private String erfme;
@ApiParam(value = "退货原因",example = "1")
@AnnoOutputColumn
private String bktxt;
@ApiParam(value = "SMRR号或DMR号",example = "1")
@AnnoOutputColumn
private String zqmd;
@ApiParam(value = "状态",example = "1")
@AnnoOutputColumn
private String zzlzt;
}

@ -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;
}

@ -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();}
}

@ -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;
}

@ -96,4 +96,11 @@ public class WmsInterfaceDataMapper extends BaseBean {
*/
@Column(name = "GROUP_NAME")
public String groupName;
/**
*
*
*/
@Column(name = "BUSI_ROUTE")
public String busiRoute;
}

@ -0,0 +1,74 @@
package cn.estsh.i3plus.pojo.wms.dbinterface;
import com.fasterxml.jackson.annotation.JsonFormat;
public class WmsInterfaceEnumUtil {
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum DIRECTION_TYPE {
SAP2WMS(10, "SAP2WMS", "SAP --> WMS"),
WMS2SAP(20, "WMS2SAP", "WMS --> SAP"),
MES2WMS(30, "MES2WMS", "MES --> WMS"),
WMS2MES(40, "WMS2MES", "WMS --> MES");
private int value;
private String name;
private String description;
DIRECTION_TYPE() {
}
DIRECTION_TYPE(int value, String name, String description) {
this.value = value;
this.name = name;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public String getName() {
return name;
}
public static String valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].getName();
}
}
return tmp;
}
public static int nameOf(String val) {
int tmp = -1;
for (int i = 0; i < values().length; i++) {
if (values()[i].name.equals(val)) {
tmp = values()[i].value;
}
}
return tmp;
}
/**
* -1
* @param desc
* @return
*/
public static int descOf(String desc) {
int tmp = -1;
for (int i = 0; i < values().length; i++) {
if (values()[i].description.equals(desc)) {
tmp = values()[i].value;
}
}
return tmp;
}
}
}

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

@ -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> {
}

@ -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;
}
}

Loading…
Cancel
Save