diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalPGIController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalPGIController.java index 19ae706c..28a20749 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalPGIController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalPGIController.java @@ -518,6 +518,8 @@ public class NormalPGIController extends BaseController { normalPGIControllerService.takeDeliveryConfirm(receiptItems, storageLocationDTOS, inventories, zwm3A17DTOS, request.getTaskId()); return ApiResult.success(); } + + /**** //一键收货 diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalQMController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalQMController.java index 8e3a0c3e..0e4a0a46 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalQMController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalQMController.java @@ -38,6 +38,9 @@ import java.util.List; import java.util.Objects; import java.util.stream.Collectors; +/** + * 质检物料管理 + */ @RestController @RequestMapping("/qm/normal") public class NormalQMController extends BaseController { @@ -60,12 +63,22 @@ public class NormalQMController extends BaseController { @Resource private IWmsSrmOrderItemService wmsSrmOrderItemService; + /** + * 获取SRM推送过来的质检单信息 + * @param request + * @return + */ @PostMapping("search") @ApiMark(moduleName = "质检物料管理", apiName = "获取SRM推送过来的质检单信息") public ApiResult> search(@Valid @RequestBody NomalQMOrderSearchQO request) { return ApiResult.success(wmsSrmQualityInspectionService.search(request)); } + /** + * 质检物料上架任务 + * @param orderNo + * @return + */ @GetMapping("task") @ApiMark(moduleName = "质检物料管理", apiName = "质检物料上架任务") public ApiResult> getTasks(@RequestParam String orderNo) { @@ -73,6 +86,9 @@ public class NormalQMController extends BaseController { return ApiResult.success(tasks); } + /** + * 质检物料上架物料详情 + * **/ @GetMapping("task/item") @ApiMark(moduleName = "质检物料管理", apiName = "质检任务上架物料详情") public ApiResult> getTaskItem(@Valid @NotNull @RequestParam Long taskId) { @@ -80,7 +96,9 @@ public class NormalQMController extends BaseController { return ApiResult.success(tasks); } - + /** + * 质检物料上架任务确认 + * **/ @PostMapping("task/confirm") @ApiMark(moduleName = "质检物料管理", apiName = "质检任务上架确认") public ApiResult confirm(@Valid @RequestBody List request) { diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/POReceiptController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/POReceiptController.java index 260a2726..b3bdc3cb 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/POReceiptController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/POReceiptController.java @@ -23,6 +23,9 @@ import org.springframework.web.bind.annotation.*; import java.util.List; +/** + * 采购单入库管理 + */ @RestController @RequestMapping("/po") public class POReceiptController { @@ -35,12 +38,18 @@ public class POReceiptController { @Resource private SrmMaterialReceiptScanCodesRepository srmMaterialReceiptCanCodesRepository; + /** + * 采购单入库列表 + */ @PostMapping("search") @ApiMark(moduleName = "采购单入库管理", apiName = "采购单入库列表") public ApiResult> search(@Valid @RequestBody POReceiptQO request) { return ApiResult.success(poReceiptService.search(request)); } + /** + * 采购单入库明细 + */ @GetMapping("getItems") @ApiMark(moduleName = "采购单入库管理", apiName = "采购单入库列表") public ApiResult> search(@RequestParam Long inId) { @@ -48,6 +57,9 @@ public class POReceiptController { .lambdaQuery().eq(WmsPoReceiptItem::getReceiveId, inId).list())); } + /** + * 获取扫码的详情信息 + */ @GetMapping("getScanCodes") @ApiMark(moduleName = "采购单入库管理", apiName = "获取扫码的详情信息") public ApiResult> getScanCodes(@RequestParam String orderItemId) { diff --git a/nflg-wms-auth/src/main/resources/application.yml b/nflg-wms-auth/src/main/resources/application.yml index 57523ba3..4053b23c 100644 --- a/nflg-wms-auth/src/main/resources/application.yml +++ b/nflg-wms-auth/src/main/resources/application.yml @@ -4,17 +4,17 @@ spring: application: name: auth profiles: - active: dev + active: sit config: import: nacos:shared.properties?group=${spring.profiles.active}&refreshEnabled=true cloud: nacos: config: - server-addr: ${nacos.server-addr:112.74.186.154:8848} + server-addr: ${nacos.server-addr:192.168.163.83:8848} namespace: wms group: ${spring.profiles.active} discovery: - server-addr: ${nacos.server-addr:112.74.186.154:8848} + server-addr: ${nacos.server-addr:192.168.163.83:8848} namespace: wms group: ${spring.profiles.active} # Sa-Token 配置 diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/POReceiptQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/POReceiptQO.java index 7bb12cc6..64b5caa9 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/POReceiptQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/POReceiptQO.java @@ -4,9 +4,12 @@ import cn.hutool.core.date.DateTime; import lombok.Data; import lombok.experimental.Accessors; +import java.time.LocalDate; +import java.time.LocalDateTime; + @Data @Accessors(chain = true) -public class POReceiptQO extends PageQO { +public class POReceiptQO extends SearchBaseQO { /** * 送货单号 @@ -26,22 +29,30 @@ public class POReceiptQO extends PageQO { /** * 送货开始时间 */ - private DateTime deliveryStartDate; + private LocalDate deliveryStartDate; /** * 送货结束时间 */ - private DateTime deliveryEndDate; + private LocalDate deliveryEndDate; + + public LocalDate getDeliveryEndDate() { + return deliveryEndDate == null ? null : deliveryEndDate.plusDays(1); + } /** * 收货开始时间 */ - private DateTime receiveStartDate; + private LocalDate receiveStartDate; /** * 收货结束时间 */ - private DateTime receiveEndDate; + private LocalDate receiveEndDate; + + public LocalDate getReceiveEndDate() { + return receiveEndDate == null ? null : receiveEndDate.plusDays(1); + } /** * 入库单号 @@ -51,11 +62,15 @@ public class POReceiptQO extends PageQO { /** * 入库开始时间 */ - private DateTime inStartDate; + private LocalDate inStartDate; /** * 入库结束时间 */ - private DateTime inEndDate; + private LocalDate inEndDate; + + public LocalDate getInEndDate() { + return inEndDate == null ? null : inEndDate.plusDays(1); + } } diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/POReceiptVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/POReceiptVO.java index ed4c9e25..45bc7776 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/POReceiptVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/POReceiptVO.java @@ -4,6 +4,8 @@ import cn.hutool.core.date.DateTime; import lombok.Data; import lombok.experimental.Accessors; +import java.time.LocalDate; +import java.time.LocalDateTime; import java.util.StringTokenizer; @Data @@ -42,7 +44,7 @@ public class POReceiptVO { /** * 发货时间 */ - private String deliveryNoteDate; + private LocalDate deliveryNoteDate; /** * 运单号 @@ -66,7 +68,7 @@ public class POReceiptVO { /** * 收货时间 */ - private DateTime receiveTime; + private LocalDate receiveTime; /** * 收货人 */ @@ -80,5 +82,5 @@ public class POReceiptVO { /** * 入库时间 */ - private String inTime; + private LocalDate inTime; } diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/SrmOrderVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/SrmOrderVO.java index 2cc24b16..87eebe84 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/SrmOrderVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/SrmOrderVO.java @@ -45,4 +45,9 @@ public class SrmOrderVO { * 供应商名称 */ private String supplierName; + + /** + * 是否完成收货 + */ + private boolean isCompleted; } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsSrmOrderMapper.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsSrmOrderMapper.java index 6223958b..267d6f9c 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsSrmOrderMapper.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsSrmOrderMapper.java @@ -24,7 +24,6 @@ public interface WmsSrmOrderMapper extends BaseMapper { List getTask(String orederNo); - List getTaskItem(String orederNo); List getUnCompletedItem(Long orderId); } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsSrmOrderService.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsSrmOrderService.java index 238f4ff8..650d6b95 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsSrmOrderService.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsSrmOrderService.java @@ -29,7 +29,7 @@ public interface IWmsSrmOrderService extends IService { List getTask(@Valid String orederNo); - List getTaskItem(@Valid String orederNo); +// List getTaskItem(@Valid String orederNo); List getUnCompletedItem(Long orderId); } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsSrmOrderServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsSrmOrderServiceImpl.java index 39850145..2f8a868d 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsSrmOrderServiceImpl.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsSrmOrderServiceImpl.java @@ -47,10 +47,10 @@ public class WmsSrmOrderServiceImpl extends ServiceImpl getTaskItem(String orederNo) { - return baseMapper.getTaskItem(orederNo); - } +// @Override +// public List getTaskItem(String orederNo) { +// return baseMapper.getTaskItem(orederNo); +// } @Override public List getUnCompletedItem(Long orderId) { diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsPoReceiptMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsPoReceiptMapper.xml index a94c1e1c..eaf8146d 100644 --- a/nflg-wms-repository/src/main/resources/mapper/WmsPoReceiptMapper.xml +++ b/nflg-wms-repository/src/main/resources/mapper/WmsPoReceiptMapper.xml @@ -32,34 +32,33 @@ - - and EXISTS (select 1 from wms_srm_order_item where a.id=wms_srm_order_item.order_id and - wms_srm_order_item.item_code like concat('%', #{request.itemCode}, '%') - - - + and a.create_time >= #{request.receiveStartDate} - - and a.create_time < #{request.receiveEndDate} + + and a.create_time <= #{request.receiveEndDate} - - and a.delivery_note_date >= #{request.deliveryStartDate} + + and b.delivery_note_date >= + #{request.deliveryStartDate, jdbcType=TIMESTAMP, javaType=java.time.LocalDate, typeHandler=org.apache.ibatis.type.LocalDateTypeHandler} - - and a.delivery_note_date < #{request.deliveryEndDate} + + and b.delivery_note_date <= + #{request.deliveryEndDate, jdbcType=TIMESTAMP, javaType=java.time.LocalDate, typeHandler=org.apache.ibatis.type.LocalDateTypeHandler} - + + and a.update_time >= #{request.inStartDate} - - and a.update_time < #{request.inEndDate} + + and a.update_time <= #{request.inEndDate} + order by a.create_time desc diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsSrmOrderMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsSrmOrderMapper.xml index ea92eb22..32bbd747 100644 --- a/nflg-wms-repository/src/main/resources/mapper/WmsSrmOrderMapper.xml +++ b/nflg-wms-repository/src/main/resources/mapper/WmsSrmOrderMapper.xml @@ -3,7 +3,7 @@ - select + select a.id,a.accept_time, a.inspection_num,a.factory,a.suppler_num as supplier_num,c.supplier_name,a.delivery_qty,a.inspection_result,a.item_code,a.inspection_type, a.po_line_number,a.inspection_qty,a.item_name,a.unit,a.received_warehouse,a.unqualified_reason,a.po_num,a.receive_num,a.unqualified_qty, a.qualified_qty,a.material_batch as - receive_batch_num,a.serial_num,a.line_number,a.note_num,a.is_in,a.receive_id,a.is_in,a.in_time,a.material_doc_105,a.material_doc_year_105 + receive_batch_num,a.serial_num,a.line_number,a.note_num,a.is_in,a.receive_id, + a.in_time,a.material_doc_105,a.material_doc_year_105 from wms_srm_quality_inspection a left join user_supplier c on a.suppler_num=c.supplier_code @@ -32,10 +33,10 @@ - and a.item_code like concat('%',#{request.itemCode},'#') + and a.item_code like concat('%',#{request.itemCode},'%') - order by a.create_time desc + order by accept_time desc