From 1e10bdee0c840e437796ab0efb2f3b368f190862 Mon Sep 17 00:00:00 2001 From: gcj Date: Fri, 6 Dec 2019 09:41:40 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E3=80=90=E5=9D=A4=E6=B3=B0=E8=BF=90?= =?UTF-8?q?=E8=BE=93=E7=AE=A1=E7=90=86=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 2 +- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsCar.java | 64 +++++++++++++ .../estsh/i3plus/pojo/wms/bean/WmsTmsDriver.java | 63 +++++++++++++ .../i3plus/pojo/wms/bean/WmsTmsShippingExt.java | 100 +++++++++++++++++++++ .../pojo/wms/repository/WmsCarRepository.java | 16 ++++ .../wms/repository/WmsTmsDriverRepository.java | 17 ++++ .../repository/WmsTmsShippingExtRepository.java | 17 ++++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 5 ++ 8 files changed, 283 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCar.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsDriver.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExt.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsCarRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTmsDriverRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTmsShippingExtRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 3a5133e..66b596c 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -942,7 +942,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 { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCar.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCar.java new file mode 100644 index 0000000..d60df26 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCar.java @@ -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; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsDriver.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsDriver.java new file mode 100644 index 0000000..0ecea20 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsDriver.java @@ -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; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExt.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExt.java new file mode 100644 index 0000000..9a65b4c --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExt.java @@ -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; + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsCarRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsCarRepository.java new file mode 100644 index 0000000..b216934 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsCarRepository.java @@ -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 { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTmsDriverRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTmsDriverRepository.java new file mode 100644 index 0000000..bc6c1c8 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTmsDriverRepository.java @@ -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 { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTmsShippingExtRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTmsShippingExtRepository.java new file mode 100644 index 0000000..a271bf3 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTmsShippingExtRepository.java @@ -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 { + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index d823254..f445d3d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -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; @@ -2515,4 +2519,5 @@ public class WmsHqlPack { return result; } + } From 1d5f4b38a4d274572a715273140f5fdf3c5ba552 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Fri, 6 Dec 2019 09:47:32 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E3=80=90KT-1282=20=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E6=8B=89=E5=8A=A8-=E7=8F=AD=E6=AC=A1=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index d23756e..ce2f35b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -2561,9 +2561,9 @@ 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); From 8dc151394715e7c22c544216bb31ccd65f137600 Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Fri, 6 Dec 2019 14:54:13 +0800 Subject: [PATCH 3/3] =?UTF-8?q?bug`6897`=20SOP=E4=BF=A1=E6=81=AF-=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E5=9B=BE=E7=89=87=E5=90=8E=E6=9C=AA=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E5=87=BA=E5=9B=BE=E7=89=87=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index 368abef..b3c14e1 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -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; }