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

Merge branch 'dev' into test

Browse Source
yun-zuoyi
jenkins 6 years ago
parent 734340fe63 c6b24ea3cc
commit 8132c94cee
6 changed files with 72 additions and 19 deletions
Show Stats Download Patch File Download Diff File

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

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

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

@ -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")

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

@ -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() {

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

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