Browse Source

要货计划展示收货人与联系电话

master_hella_20240701
chenfang 1 year ago
parent
commit
c717c6770b
  1. 6
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasePlan/vo/PurchasePlanMainBaseVO.java
  2. 6
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasePlan/vo/PurchasePlanMainExportReqVO.java
  3. 6
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasePlan/vo/PurchasePlanMainPageReqVO.java
  4. 8
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchasePlan/PurchasePlanMainDO.java
  5. 3
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasePlan/PurchasePlanMainMapper.java
  6. 2
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasePlan/PurchasePlanMainServiceImpl.java

6
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasePlan/vo/PurchasePlanMainBaseVO.java

@ -83,4 +83,10 @@ public class PurchasePlanMainBaseVO {
@Schema(description = "订单号", requiredMode = Schema.RequiredMode.REQUIRED) @Schema(description = "订单号", requiredMode = Schema.RequiredMode.REQUIRED)
private String poNumber; private String poNumber;
@Schema(description = "收货人", requiredMode = Schema.RequiredMode.REQUIRED)
private String contacts;
@Schema(description = "联系电话", requiredMode = Schema.RequiredMode.REQUIRED)
private String phone;
} }

6
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasePlan/vo/PurchasePlanMainExportReqVO.java

@ -63,4 +63,10 @@ public class PurchasePlanMainExportReqVO {
@Schema(description = "订单号", requiredMode = Schema.RequiredMode.REQUIRED) @Schema(description = "订单号", requiredMode = Schema.RequiredMode.REQUIRED)
private String poNumber; private String poNumber;
@Schema(description = "收货人", requiredMode = Schema.RequiredMode.REQUIRED)
private String contacts;
@Schema(description = "联系电话", requiredMode = Schema.RequiredMode.REQUIRED)
private String phone;
} }

6
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasePlan/vo/PurchasePlanMainPageReqVO.java

@ -66,4 +66,10 @@ public class PurchasePlanMainPageReqVO extends PageParam {
@Schema(description = "订单号", requiredMode = Schema.RequiredMode.REQUIRED) @Schema(description = "订单号", requiredMode = Schema.RequiredMode.REQUIRED)
private String poNumber; private String poNumber;
@Schema(description = "收货人", requiredMode = Schema.RequiredMode.REQUIRED)
private String contacts;
@Schema(description = "联系电话", requiredMode = Schema.RequiredMode.REQUIRED)
private String phone;
} }

8
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchasePlan/PurchasePlanMainDO.java

@ -119,4 +119,12 @@ public class PurchasePlanMainDO extends BaseDO {
* 订单号 * 订单号
*/ */
private String poNumber; private String poNumber;
/**
* 收货人
*/
private String contacts;
/**
* 联系电话
*/
private String phone;
} }

3
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasePlan/PurchasePlanMainMapper.java

@ -41,6 +41,8 @@ public interface PurchasePlanMainMapper extends BaseMapperX<PurchasePlanMainDO>
.likeIfPresent(PurchasePlanMainDO::getUpdater, reqVO.getUpdater()) .likeIfPresent(PurchasePlanMainDO::getUpdater, reqVO.getUpdater())
.likeIfPresent(PurchasePlanMainDO::getAvailable, reqVO.getAvailable()) .likeIfPresent(PurchasePlanMainDO::getAvailable, reqVO.getAvailable())
.likeIfPresent(PurchasePlanMainDO::getPoNumber, reqVO.getPoNumber()) .likeIfPresent(PurchasePlanMainDO::getPoNumber, reqVO.getPoNumber())
.likeIfPresent(PurchasePlanMainDO::getContacts, reqVO.getContacts())
.likeIfPresent(PurchasePlanMainDO::getPhone, reqVO.getPhone())
.orderByDesc(PurchasePlanMainDO::getId)); .orderByDesc(PurchasePlanMainDO::getId));
} }
@ -78,6 +80,7 @@ public interface PurchasePlanMainMapper extends BaseMapperX<PurchasePlanMainDO>
.eqIfPresent(PurchasePlanMainDO::getUpdater, reqVO.getUpdater()) .eqIfPresent(PurchasePlanMainDO::getUpdater, reqVO.getUpdater())
.eqIfPresent(PurchasePlanMainDO::getAvailable, reqVO.getAvailable()) .eqIfPresent(PurchasePlanMainDO::getAvailable, reqVO.getAvailable())
.likeIfPresent(PurchasePlanMainDO::getPoNumber, reqVO.getPoNumber()) .likeIfPresent(PurchasePlanMainDO::getPoNumber, reqVO.getPoNumber())
.likeIfPresent(PurchasePlanMainDO::getPhone, reqVO.getPhone())
.orderByDesc(PurchasePlanMainDO::getId)); .orderByDesc(PurchasePlanMainDO::getId));
} }

2
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasePlan/PurchasePlanMainServiceImpl.java

@ -627,6 +627,8 @@ public class PurchasePlanMainServiceImpl implements PurchasePlanMainService {
purchasePlanMainRespVO.setDockCode(String.valueOf(conditionObject.get("DockCode"))); purchasePlanMainRespVO.setDockCode(String.valueOf(conditionObject.get("DockCode")));
purchasePlanMainRespVO.setBeginTime(String.valueOf(conditionObject.get("BeginTime"))); purchasePlanMainRespVO.setBeginTime(String.valueOf(conditionObject.get("BeginTime")));
purchasePlanMainRespVO.setEndTime(String.valueOf(conditionObject.get("EndTime"))); purchasePlanMainRespVO.setEndTime(String.valueOf(conditionObject.get("EndTime")));
purchasePlanMainRespVO.setContacts(String.valueOf(conditionObject.get("Receiver")));
purchasePlanMainRespVO.setPhone(String.valueOf(conditionObject.get("PhoneNumber")));
purchasePlanMainRespVO.setTimeWindow(purchasePlanMainRespVO.getBeginTime() + "-" + purchasePlanMainRespVO.getEndTime()); purchasePlanMainRespVO.setTimeWindow(purchasePlanMainRespVO.getBeginTime() + "-" + purchasePlanMainRespVO.getEndTime());
return purchasePlanMainRespVO; return purchasePlanMainRespVO;
} }

Loading…
Cancel
Save