yun-zuoyi
WYnneaoapc 6 years ago
commit ffb977ffc5

@ -961,7 +961,7 @@ public class WmsEnumUtil {
/**
*
* 1=10=20=30=40=50=60=70=
* 10=20=30=40=50=60=70=80=
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum STOCK_SN_STATUS {

@ -477,10 +477,6 @@ public class MesHqlPack {
public static DdlPackBean getEsopExcludeById(MesEsop esop, String org) {
DdlPackBean packBean = getAllBaseData(org);
DdlPreparedPack.getStringEqualPack(esop.getPartNo(), "partNo", packBean);
DdlPreparedPack.getStringEqualPack(esop.getRouteCode(), "routeCode", packBean);
DdlPreparedPack.getStringEqualPack(esop.getProcessCode(), "processCode", packBean);
DdlPreparedPack.getStringEqualPack(esop.getStepCode(), "stepCode", packBean);
DdlPreparedPack.getNumEqualPack(esop.getStepSeq(), "stepSeq", packBean);
DdlPreparedPack.getStringEqualPack(esop.getWorkCenterCode(), "workCenterCode", packBean);
DdlPreparedPack.getStringEqualPack(esop.getWorkCellCode(), "workCellCode", packBean);
DdlPreparedPack.getNumNOEqualPack(esop.getId(), "id", packBean);
@ -1055,16 +1051,9 @@ public class MesHqlPack {
*/
public static DdlPackBean getMesPcnSyncCfg(MesPcnSyncCfg pcnSyncCfg, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(pcnSyncCfg, organizeCode);
if (!StringUtils.isEmpty(pcnSyncCfg.getObjectCode())) {
DdlPreparedPack.getStringLikerPack(pcnSyncCfg.getObjectCode(), "objectCode", packBean);
}
if (!StringUtils.isEmpty(pcnSyncCfg.getPcnCode())) {
DdlPreparedPack.getStringLikerPack(pcnSyncCfg.getPcnCode(), "pcnCode", packBean);
}
if (null != pcnSyncCfg.getSyncType()) {
DdlPreparedPack.getNumEqualPack(pcnSyncCfg.getSyncType(), "syncType", packBean);
}
DdlPreparedPack.getStringLikerPack(pcnSyncCfg.getObjectCode(), "objectCode", packBean);
DdlPreparedPack.getStringLikerPack(pcnSyncCfg.getPcnCode(), "pcnCode", packBean);
DdlPreparedPack.getNumEqualPack(pcnSyncCfg.getSyncType(), "syncType", packBean);
return packBean;
}

@ -0,0 +1,64 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
/**
* @Description :
* @Reference :
* @Author : gcj
* @CreateDate : 2019-12-06 15:58
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="WMS_CAR")
@Api("车辆信息")
public class WmsCar extends BaseBean {
@Column(name="CAR_NO")
@ApiParam(value ="车牌号")
private String carNo;
@Column(name="CAR_DESC")
@ApiParam(value ="车辆描述")
private String carDesc;
@Column(name="MAX_CAPACITY")
@ApiParam(value ="载重量(KG)")
private String maxCapacity;
@Column(name="DRIVER_NO")
@ApiParam(value ="默认驾驶员")
private String driverNo;
@Column(name="PHONE")
@ApiParam(value ="车主电话")
private String phone;
@Column(name="VENDOR_NO")
@ApiParam(value ="所属供应商")
private String vendorNo;
@Transient
@ApiParam("司机名称")
private String driverNameRdd;
@Transient
@ApiParam(value = "供应商名称")
private String vendorNameRdd;
}

@ -0,0 +1,63 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description :
* @Reference :
* @Author : gcj
* @CreateDate : 2019-12-06 15:58
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="WMS_TMS_DRIVER")
@Api("驾驶员信息")
public class WmsTmsDriver extends BaseBean {
@Column(name="DRIVER_NO")
@ApiParam(value ="驾驶员编号")
private String driverNo;
@Column(name="DRIVER_NAME")
@ApiParam(value ="驾驶员姓名")
private String driverName;
@Column(name="SEX")
@ApiParam(value ="驾驶员性别")
private Integer sex;
@Column(name="AGE")
@ApiParam(value ="驾驶员年龄")
private String age;
@Column(name="ID_NO")
@ApiParam(value ="驾驶员身份证号")
private String idNo;
@Column(name="ADRESS")
@ApiParam(value ="驾驶员籍贯")
private String adress;
@Column(name="PHONE")
@ApiParam(value ="车牌号")
private String phone;
@Column(name="LOGIN_NO")
@ApiParam(value =" 登录账号")
private String loginNo;
}

@ -0,0 +1,100 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description :
* @Reference :
* @Author : gcj
* @CreateDate : 2019-12-06 15:58
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="WMS_TMS_SHIPPING_EXT")
@Api("装车单信息")
public class WmsTmsShippingExt extends BaseBean {
@Column(name="MOVE_NO")
@ApiParam(value ="移库单号")
private String moveNo;
@Column(name="DESTINATION")
@ApiParam(value ="到货地点")
private String destination;
@Column(name="REC_USER")
@ApiParam(value ="接收人")
private String recUser;
@Column(name="REC_PHONE")
@ApiParam(value ="接收人电话")
private String recPhone;
@Column(name="DOCK_NO")
@ApiParam(value ="道口")
private String dockNo;
@Column(name="VENDOR_NO")
@ApiParam(value ="承运商编号")
private String vendorNo;
@Column(name="VENDOR_NAME")
@ApiParam(value ="承运商名称RDD")
private String vendorName;
@Column(name="DRIVER_NO")
@ApiParam(value ="驾驶员编号")
private String driverNo;
@Column(name="DRIVER_NAME")
@ApiParam(value ="驾驶员名称RDD")
private String driverName;
@Column(name="PHONE")
@ApiParam(value ="驾驶员联系方式RDD")
private String phone;
@Column(name="ORDER_STATUS")
@ApiParam(value ="单据状态")
private String orderStatus;
@Column(name="CUST_NAME")
@ApiParam(value ="客户名称RDD")
private String custName;
@Column(name="CUST_NO")
@ApiParam(value ="客户编号RDD")
private String custNo;
@Column(name="CAR_NO")
@ApiParam(value ="车牌号RDD")
private String carNo;
@Column(name="DELIVERY_TIME")
@ApiParam(value ="计划发车时间")
private String deliveryTime;
@Column(name="ARRIVEL_TIME")
@ApiParam(value ="要求到货时间")
private String arrivelTime;
@Column(name="DEPART")
@ApiParam(value =" 申请部门")
private String depart;
}

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.wms.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.wms.bean.WmsCar;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : gcj
* @CreateDate : 2019-12-04 15:29
* @Modify:
**/
@Repository
public interface WmsCarRepository extends BaseRepository<WmsCar, Long> {
}

@ -0,0 +1,17 @@
package cn.estsh.i3plus.pojo.wms.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.wms.bean.WmsCar;
import cn.estsh.i3plus.pojo.wms.bean.WmsTmsDriver;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : gcj
* @CreateDate : 2019-12-04 15:29
* @Modify:
**/
@Repository
public interface WmsTmsDriverRepository extends BaseRepository<WmsTmsDriver, Long> {
}

@ -0,0 +1,17 @@
package cn.estsh.i3plus.pojo.wms.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.wms.bean.WmsTmsShippingExt;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : gcj
* @CreateDate : 2018-11-06 13:40
* @Modify:
**/
@Repository
public interface WmsTmsShippingExtRepository extends BaseRepository<WmsTmsShippingExt,Long> {
}

@ -6,14 +6,18 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
import cn.estsh.i3plus.pojo.base.tool.HqlPack;
import cn.estsh.i3plus.pojo.base.util.StringUtil;
import cn.estsh.i3plus.pojo.wms.bean.*;
import cn.estsh.i3plus.pojo.wms.dbinterface.WmsInterfaceDataMapper;
import cn.estsh.i3plus.pojo.wms.engine.rule.EngineRulePersistence;
import cn.estsh.i3plus.pojo.wms.engine.script.EngineScriptPersistence;
import com.alibaba.fastjson.JSONObject;
import com.google.common.base.Strings;
import org.apache.commons.beanutils.BeanUtils;
import org.apache.commons.lang3.StringUtils;
import java.lang.reflect.Constructor;
import java.lang.reflect.Field;
import java.util.*;
import java.util.stream.Collectors;
@ -2561,12 +2565,13 @@ public class WmsHqlPack {
public static DdlPackBean packHqlWmsShiftRest(WmsShiftRest wmsShiftRest) {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringLikerPack(wmsShiftRest.getShiftNo(), "shiftNo", result);
DdlPreparedPack.getStringLikerPack(wmsShiftRest.getRestNo(), "restNo", result);
DdlPreparedPack.getStringLikerPack(wmsShiftRest.getRestName(), "restName", result);
DdlPreparedPack.getStringEqualPack(wmsShiftRest.getShiftNo(), "shiftNo", result);
DdlPreparedPack.getStringEqualPack(wmsShiftRest.getRestNo(), "restNo", result);
DdlPreparedPack.getStringEqualPack(wmsShiftRest.getRestName(), "restName", result);
getStringBuilderPack(wmsShiftRest, result);
return result;
}
}

Loading…
Cancel
Save