rakor
/
wms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/惠信/dev_zhangke' into develop

This commit is contained in:
曹鹏飞 2025-08-25 18:02:17 +08:00
parent 69adc3fb18 265fd6c54f
commit 722bd067fc
13 changed files with 93 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalPGIController.java
View File

@ -518,6 +518,8 @@ public class NormalPGIController extends BaseController {
normalPGIControllerService.takeDeliveryConfirm(receiptItems, storageLocationDTOS, inventories, zwm3A17DTOS, request.getTaskId());
return ApiResult.success();
}
/****
//一键收货

20
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalQMController.java
View File

@ -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<PageData<QualityInspectionVO>> search(@Valid @RequestBody NomalQMOrderSearchQO request) {
return ApiResult.success(wmsSrmQualityInspectionService.search(request));
}
/**
* 质检物料上架任务
* @param orderNo
* @return
*/
@GetMapping("task")
@ApiMark(moduleName = "质检物料管理", apiName = "质检物料上架任务")
public ApiResult<List<QCTaskVO>> 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<List<QCTaskItemVO>> 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<Void> confirm(@Valid @RequestBody List<QCReceiveTaskConfirmQO> request) {

12
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/POReceiptController.java
View File

@ -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<PageData<POReceiptVO>> search(@Valid @RequestBody POReceiptQO request) {
return ApiResult.success(poReceiptService.search(request));
}
/**
* 采购单入库明细
*/
@GetMapping("getItems")
@ApiMark(moduleName = "采购单入库管理", apiName = "采购单入库列表")
public ApiResult<List<PoReceiveTaskItemVO>> search(@RequestParam Long inId) {
@ -48,6 +57,9 @@ public class POReceiptController {
.lambdaQuery().eq(WmsPoReceiptItem::getReceiveId, inId).list()));
}
/**
* 获取扫码的详情信息
*/
@GetMapping("getScanCodes")
@ApiMark(moduleName = "采购单入库管理", apiName = "获取扫码的详情信息")
public ApiResult<List<PDAScanCodeVO>> getScanCodes(@RequestParam String orderItemId) {

6
nflg-wms-auth/src/main/resources/application.yml
View File

@ -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 配置

29
nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/POReceiptQO.java
View File

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

8
nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/POReceiptVO.java
View File

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

5
nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/SrmOrderVO.java
View File

@ -45,4 +45,9 @@ public class SrmOrderVO {
* 供应商名称
*/
private String supplierName;
/**
* 是否完成收货
*/
private boolean isCompleted;
}

1
nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsSrmOrderMapper.java
View File

@ -24,7 +24,6 @@ public interface WmsSrmOrderMapper extends BaseMapper<WmsSrmOrder> {
List<PoReceiveTaskVO> getTask(String orederNo);
List<PoReceiveTaskItemVO> getTaskItem(String orederNo);
List<WmsSrmOrder> getUnCompletedItem(Long orderId);
}

2
nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsSrmOrderService.java
View File

@ -29,7 +29,7 @@ public interface IWmsSrmOrderService extends IService<WmsSrmOrder> {
List<PoReceiveTaskVO> getTask(@Valid String orederNo);
List<PoReceiveTaskItemVO> getTaskItem(@Valid String orederNo);
// List<PoReceiveTaskItemVO> getTaskItem(@Valid String orederNo);
List<WmsSrmOrder> getUnCompletedItem(Long orderId);
}

8
nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsSrmOrderServiceImpl.java
View File

@ -47,10 +47,10 @@ public class WmsSrmOrderServiceImpl extends ServiceImpl<WmsSrmOrderMapper, WmsSr
return baseMapper.getTask(orederNo);
}
@Override
public List<PoReceiveTaskItemVO> getTaskItem(String orederNo) {
return baseMapper.getTaskItem(orederNo);
}
// @Override
// public List<PoReceiveTaskItemVO> getTaskItem(String orederNo) {
// return baseMapper.getTaskItem(orederNo);
// }
@Override
public List<WmsSrmOrder> getUnCompletedItem(Long orderId) {

29
nflg-wms-repository/src/main/resources/mapper/WmsPoReceiptMapper.xml
View File

@ -32,34 +32,33 @@
</if>
<if test="request.itemCode !=null and request.itemCode !='' ">
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}, '%')
</if>
<if test="request.receiveStartDate !=null and request.receiveStartDate !='' ">
<if test="request.receiveStartDate !=null">
and a.create_time >= #{request.receiveStartDate}
</if>
<if test="request.receiveEndDate !=null and request.receiveEndDate !='' ">
and a.create_time &lt; #{request.receiveEndDate}
<if test="request.receiveEndDate !=null">
and a.create_time &lt;= #{request.receiveEndDate}
</if>
<if test="request.deliveryStartDate !=null and request.deliveryStartDate !='' ">
and a.delivery_note_date >= #{request.deliveryStartDate}
<if test="request.deliveryStartDate !=null">
and b.delivery_note_date >=
#{request.deliveryStartDate, jdbcType=TIMESTAMP, javaType=java.time.LocalDate, typeHandler=org.apache.ibatis.type.LocalDateTypeHandler}
</if>
<if test="request.deliveryEndDate !=null and request.deliveryEndDate !='' ">
and a.delivery_note_date &lt; #{request.deliveryEndDate}
<if test="request.deliveryEndDate !=null">
and b.delivery_note_date &lt;=
#{request.deliveryEndDate, jdbcType=TIMESTAMP, javaType=java.time.LocalDate, typeHandler=org.apache.ibatis.type.LocalDateTypeHandler}
</if>
<if test="request.inStartDate !=null and request.inStartDate !='' ">
<if test="request.inStartDate !=null">
and a.update_time >= #{request.inStartDate}
</if>
<if test="request.inEndDate !=null and request.inEndDate !='' ">
and a.update_time &lt; #{request.inEndDate}
<if test="request.inEndDate !=null">
and a.update_time &lt;= #{request.inEndDate}
</if>
</where>
order by a.create_time desc
</select>

2
nflg-wms-repository/src/main/resources/mapper/WmsSrmOrderMapper.xml
View File

@ -3,7 +3,7 @@
<mapper namespace="com.nflg.wms.repository.mapper.WmsSrmOrderMapper">
<select id="search" resultType="com.nflg.wms.common.pojo.vo.SrmOrderVO">
select a.iu_code,a.note_num,a.purchase_group,a.waybill_num,a.supplier_num,a.create_time, a.delivery_note_date
,a.ou_code,
,a.ou_code, a.is_completed,
b.supplier_name from wms_srm_order a left join user_supplier b on a.supplier_num=b.supplier_code
<if test="request.noteNum !=null and request.noteNum !='' ">

9
nflg-wms-repository/src/main/resources/mapper/WmsSrmQualityInspectionMapper.xml
View File

@ -2,12 +2,13 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.nflg.wms.repository.mapper.WmsSrmQualityInspectionMapper">
<select id="search" resultType="com.nflg.wms.common.pojo.vo.QualityInspectionVO">
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
<where>
@ -32,10 +33,10 @@
</if>
<if test="request.itemCode !=null and request.itemCode !='' ">
and a.item_code like concat('%',#{request.itemCode},'#')
and a.item_code like concat('%',#{request.itemCode},'%')
</if>
</where>
order by a.create_time desc
order by accept_time desc
</select>
<select id="getTasks" resultType="com.nflg.wms.common.pojo.vo.QCTaskVO">