no message

nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/customer/service/impl/CustomerQueryServiceImpl.java

@@ -20,6 +20,7 @@ import org.springframework.stereotype.Service;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 @Service
@@ -69,7 +70,7 @@ public class CustomerQueryServiceImpl implements CustomerQueryService {
             return Collections.emptyMap();
         }
         //去重
-        customerIdList = customerIdList.stream().distinct().collect(Collectors.toList());
+        customerIdList = customerIdList.stream().filter(Objects::nonNull).distinct().toList();
         //封装map
         Map<Long, CustomerEntity> customerMap = Maps.newHashMap();
         for (Long customerId : customerIdList) {

nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/asn/domain/entity/AsnEntity.java

@@ -48,6 +48,12 @@ public class AsnEntity implements Serializable {
     @DataTracerFieldLabel("入库单号")
     private String asnNumber;
 
+    /**
+     * 客户
+     */
+    @DataTracerFieldLabel("客户")
+    private Long customerId;
+
     /**
      * 客户订单号
      */
@@ -92,11 +98,7 @@ public class AsnEntity implements Serializable {
     @DataTracerFieldLabel("地址")
     private String address;
 
-    /**
+
-     * 客户
-     */
-    @DataTracerFieldLabel("客户")
-    private Long customerId;
 
     /**
      * 订单数量

nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/shipping/pick/controller/PickController.java

@@ -7,14 +7,12 @@ import net.lab1024.sa.admin.module.business.wms.shipping.pick.domain.form.PickUp
 import net.lab1024.sa.admin.module.business.wms.shipping.pick.domain.vo.PickVO;
 import net.lab1024.sa.admin.module.business.wms.shipping.pick.service.PickQueryService;
 import net.lab1024.sa.admin.module.business.wms.shipping.pick.service.PickService;
+import net.lab1024.sa.base.common.domain.RequestUser;
 import net.lab1024.sa.base.common.domain.ValidateList;
-import org.springframework.web.bind.annotation.GetMapping;
+import net.lab1024.sa.base.common.util.SmartRequestUtil;
-import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.*;
 import net.lab1024.sa.base.common.domain.ResponseDTO;
 import net.lab1024.sa.base.common.domain.PageResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Operation;
 import cn.dev33.satoken.annotation.SaCheckPermission;
@@ -50,6 +48,9 @@ public class PickController {
     @PostMapping("/pick/add")
     @SaCheckPermission("pick:add")
     public ResponseDTO<PickEntity> add(@RequestBody @Valid PickAddForm addForm) {
+        RequestUser requestUser = SmartRequestUtil.getRequestUser();
+        addForm.setCreateUserId(requestUser.getUserId());
+        addForm.setCreateUserName(requestUser.getUserName());
         return pickService.add(addForm);
     }
 
@@ -62,15 +63,15 @@ public class PickController {
 
     @Operation(summary = "批量删除 @author 霍锦")
     @PostMapping("/pick/batchDelete")
-    @SaCheckPermission("pick:delete")
+    @SaCheckPermission("pick:batchDelete")
     public ResponseDTO<String> batchDelete(@RequestBody ValidateList<Long> idList) {
         return pickService.batchDelete(idList);
     }
 
     @Operation(summary = "单个删除 @author 霍锦")
-    @GetMapping("/pick/delete/{pickId}")
+    @GetMapping("/pick/delete")
     @SaCheckPermission("pick:delete")
-    public ResponseDTO<String> batchDelete(@PathVariable Long pickId) {
+    public ResponseDTO<String> delete(@RequestParam Long pickId) {
         return pickService.delete(pickId);
     }
 }

nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/shipping/pick/domain/entity/PickEntity.java

@@ -6,10 +6,11 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import lombok.Data;
-import net.lab1024.sa.admin.module.business.wms.receive.asn.constant.AsnOrderStatusEnum;
+import net.lab1024.sa.admin.module.business.wms.shipping.pick.constant.PickOrderStatusEnum;
-import net.lab1024.sa.admin.module.business.wms.receive.asn.constant.AsnOrderTypeEnum;
+import net.lab1024.sa.admin.module.business.wms.shipping.pick.constant.PickOrderTypeEnum;
 import net.lab1024.sa.base.module.support.datatracer.annoation.DataTracerFieldEnum;
 import net.lab1024.sa.base.module.support.datatracer.annoation.DataTracerFieldLabel;
 
@@ -34,9 +35,15 @@ public class PickEntity {
     /**
      * 出库单号
      */
-    @DataTracerFieldLabel("入库单号")
+    @DataTracerFieldLabel("出库单号")
     private String pickNumber;
 
+    /**
+     * 客户
+     */
+    @DataTracerFieldLabel("客户")
+    private Long customerId;
+
     /**
      * 客户订单号
      */
@@ -47,7 +54,7 @@ public class PickEntity {
      * 单据类型
      */
     @DataTracerFieldLabel("单据类型")
-    @DataTracerFieldEnum(enumClass = AsnOrderTypeEnum.class)
+    @DataTracerFieldEnum(enumClass = PickOrderTypeEnum.class)
     private String orderType;
 
     /**
@@ -55,7 +62,7 @@ public class PickEntity {
      *
      */
     @DataTracerFieldLabel("状态")
-    @DataTracerFieldEnum(enumClass = AsnOrderStatusEnum.class)
+    @DataTracerFieldEnum(enumClass = PickOrderStatusEnum.class)
     private String status;
 
     /**
@@ -106,7 +113,7 @@ public class PickEntity {
     /**
      * 订单日期
      */
-    private LocalDateTime orderDate;
+    private LocalDate orderDate;
 
     /**
      * 创建时间

nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/shipping/pick/domain/form/PickAddForm.java

@@ -5,11 +5,10 @@ import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 
 import java.time.LocalDate;
-import java.time.LocalDateTime;
 
 import lombok.Data;
-import net.lab1024.sa.admin.module.business.wms.receive.asn.constant.AsnOrderStatusEnum;
+import net.lab1024.sa.admin.module.business.wms.shipping.pick.constant.PickOrderStatusEnum;
-import net.lab1024.sa.admin.module.business.wms.receive.asn.constant.AsnOrderTypeEnum;
+import net.lab1024.sa.admin.module.business.wms.shipping.pick.constant.PickOrderTypeEnum;
 import net.lab1024.sa.base.common.swagger.SchemaEnum;
 import net.lab1024.sa.base.common.validator.enumeration.CheckEnum;
 
@@ -26,8 +25,8 @@ public class PickAddForm {
     @Schema(description = "出库单号")
     private String pickNumber;
 
-    @SchemaEnum(AsnOrderStatusEnum.class)
+    @SchemaEnum(PickOrderStatusEnum.class)
-    @CheckEnum(message = "状态", value = AsnOrderStatusEnum.class)
+    @CheckEnum(message = "状态", value = PickOrderStatusEnum.class)
     private String status;
 
     @Schema(description = "客户", requiredMode = Schema.RequiredMode.REQUIRED)
@@ -38,8 +37,8 @@ public class PickAddForm {
     @NotBlank(message = "客户订单号 不能为空")
     private String customerNumber;
 
-    @SchemaEnum(AsnOrderTypeEnum.class)
+    @SchemaEnum(PickOrderTypeEnum.class)
-    @CheckEnum(message = "单据类型", value = AsnOrderTypeEnum.class, required = true)
+    @CheckEnum(message = "单据类型 不能为空", value = PickOrderTypeEnum.class, required = true)
     private String orderType;
 
     @Schema(description = "收货单位", requiredMode = Schema.RequiredMode.REQUIRED)

nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/shipping/pick/domain/vo/PickVO.java

@@ -2,6 +2,7 @@ package net.lab1024.sa.admin.module.business.wms.shipping.pick.domain.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import lombok.Data;
 
@@ -26,6 +27,12 @@ public class PickVO {
     @Schema(description = "客户订单号")
     private String customerNumber;
 
+    @Schema(description = "客户id")
+    private Long customerId;
+
+    @Schema(description = "客户")
+    private String customerName;
+
     @Schema(description = "单据类型")
     private String orderType;
 
@@ -35,6 +42,18 @@ public class PickVO {
     @Schema(description = "收货地址")
     private Long addressId;
 
+    @Schema(description = "收货单位")
+    private String name;
+
+    @Schema(description = "联系人")
+    private String person;
+
+    @Schema(description = "电话")
+    private String telephone;
+
+    @Schema(description = "地址")
+    private String address;
+
     @Schema(description = "订单数量")
     private BigDecimal orderQuantity;
 
@@ -48,7 +67,7 @@ public class PickVO {
     private BigDecimal shippedQuantity;
 
     @Schema(description = "订单日期")
-    private LocalDateTime orderDate;
+    private LocalDate orderDate;
 
     @Schema(description = "创建时间")
     private LocalDateTime createTime;

nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/shipping/pick/service/impl/PickQueryServiceImpl.java

@@ -3,7 +3,12 @@ package net.lab1024.sa.admin.module.business.wms.shipping.pick.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import jakarta.annotation.Resource;
+import net.lab1024.sa.admin.module.business.wms.base.address.domain.entity.AddressEntity;
+import net.lab1024.sa.admin.module.business.wms.base.address.service.AddressQueryService;
+import net.lab1024.sa.admin.module.business.wms.base.customer.domain.entity.CustomerEntity;
+import net.lab1024.sa.admin.module.business.wms.base.customer.service.CustomerQueryService;
 import net.lab1024.sa.admin.module.business.wms.receive.asn.domain.entity.AsnEntity;
+import net.lab1024.sa.admin.module.business.wms.receive.asn.domain.vo.AsnVO;
 import net.lab1024.sa.admin.module.business.wms.shipping.pick.dao.PickDao;
 import net.lab1024.sa.admin.module.business.wms.shipping.pick.domain.entity.PickEntity;
 import net.lab1024.sa.admin.module.business.wms.shipping.pick.domain.form.PickQueryForm;
@@ -18,6 +23,7 @@ import org.springframework.stereotype.Service;
 
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 
 @Service
@@ -29,12 +35,37 @@ public class PickQueryServiceImpl implements PickQueryService {
     @Resource
     private PickManager pickManager;
 
+    @Resource
+    private CustomerQueryService customerQueryService;
+
+    @Resource
+    private AddressQueryService addressQueryService;
+
     /**
      * 分页查询
      */
     public PageResult<PickVO> queryPage(PickQueryForm queryForm) {
         Page<?> page = SmartPageUtil.convert2PageQuery(queryForm);
         List<PickVO> list = pickDao.queryPage(page, queryForm);
+
+        // 查询客户名称
+        List<Long> customerIdList = list.stream().map(PickVO::getCustomerId).toList();
+        Map<Long, CustomerEntity> customerMap = customerQueryService.queryByCustomerIdsToMap(customerIdList);
+
+        // 查询收货单位
+        List<Long> addressIdList = list.stream().map(PickVO::getAddressId).toList();
+        Map<Long, AddressEntity> addressMap = addressQueryService.queryByAddressIdsToMap(addressIdList);
+
+        list.forEach(pickVO -> {
+            CustomerEntity customer = customerMap.get(pickVO.getCustomerId());
+            if (customer != null) {
+                pickVO.setCustomerName(customer.getCustomerName());
+            }
+            AddressEntity address = addressMap.get(pickVO.getAddressId());
+            if (address != null) {
+                pickVO.setName(address.getName());
+            }
+        });
         return SmartPageUtil.convert2PageResult(page, list);
     }
 

nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/shipping/pickDetail/controller/PickDetailController.java

@@ -6,14 +6,12 @@ import net.lab1024.sa.admin.module.business.wms.shipping.pickDetail.domain.form.
 import net.lab1024.sa.admin.module.business.wms.shipping.pickDetail.domain.vo.PickDetailVO;
 import net.lab1024.sa.admin.module.business.wms.shipping.pickDetail.service.PickDetailQueryService;
 import net.lab1024.sa.admin.module.business.wms.shipping.pickDetail.service.PickDetailService;
+import net.lab1024.sa.base.common.domain.RequestUser;
 import net.lab1024.sa.base.common.domain.ValidateList;
-import org.springframework.web.bind.annotation.GetMapping;
+import net.lab1024.sa.base.common.util.SmartRequestUtil;
-import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.*;
 import net.lab1024.sa.base.common.domain.ResponseDTO;
 import net.lab1024.sa.base.common.domain.PageResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Operation;
 import cn.dev33.satoken.annotation.SaCheckPermission;
@@ -49,6 +47,9 @@ public class PickDetailController {
     @PostMapping("/pickDetail/add")
     @SaCheckPermission("pickDetail:add")
     public ResponseDTO<String> add(@RequestBody @Valid PickDetailAddForm addForm) {
+        RequestUser requestUser = SmartRequestUtil.getRequestUser();
+        addForm.setCreateUserId(requestUser.getUserId());
+        addForm.setCreateUserName(requestUser.getUserName());
         return pickDetailService.add(addForm);
     }
 
@@ -61,15 +62,15 @@ public class PickDetailController {
 
     @Operation(summary = "批量删除 @author 霍锦")
     @PostMapping("/pickDetail/batchDelete")
-    @SaCheckPermission("pickDetail:delete")
+    @SaCheckPermission("pickDetail:batchDelete")
     public ResponseDTO<String> batchDelete(@RequestBody ValidateList<Long> idList) {
         return pickDetailService.batchDelete(idList);
     }
 
     @Operation(summary = "单个删除 @author 霍锦")
-    @GetMapping("/pickDetail/delete/{pickDetailId}")
+    @GetMapping("/pickDetail/delete")
     @SaCheckPermission("pickDetail:delete")
-    public ResponseDTO<String> batchDelete(@PathVariable Long pickDetailId) {
+    public ResponseDTO<String> delete(@RequestParam Long pickDetailId) {
         return pickDetailService.delete(pickDetailId);
     }
 }

nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/shipping/pickDetail/domain/form/PickDetailAddForm.java

@@ -28,6 +28,10 @@ public class PickDetailAddForm {
     @NotNull(message = "物料 不能为空")
     private Long itemId;
 
+    @Schema(description = "批次", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotBlank(message = "批次 不能为空")
+    private String propC1;
+
     @Schema(description = "订单数量")
     @NotNull(message = "订单数量不能为空")
     @DecimalMin(value = "1", message = "订单数量最低1")

nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/shipping/pickDetail/domain/form/PickDetailQueryForm.java

@@ -1,5 +1,6 @@
 package net.lab1024.sa.admin.module.business.wms.shipping.pickDetail.domain.form;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import net.lab1024.sa.base.common.domain.PageParam;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -16,4 +17,9 @@ import lombok.EqualsAndHashCode;
 @EqualsAndHashCode(callSuper = false)
 public class PickDetailQueryForm extends PageParam {
 
+    @Schema(description = "出库单")
+    private Long pickId;
+
+    @Schema(description = "物料")
+    private Long itemId;
 }

nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/shipping/pickDetail/domain/vo/PickDetailVO.java

@@ -27,6 +27,12 @@ public class PickDetailVO {
     @Schema(description = "物料id")
     private Long itemId;
 
+    @Schema(description = "物料编码")
+    private String itemCode;
+
+    @Schema(description = "物料名称")
+    private String itemName;
+
     @Schema(description = "批次号")
     private String propC1;
 

nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/shipping/pickDetail/service/impl/PickDetailQueryServiceImpl.java

@@ -4,6 +4,9 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.collect.Maps;
 import jakarta.annotation.Resource;
+import net.lab1024.sa.admin.module.business.wms.base.item.domain.entity.ItemEntity;
+import net.lab1024.sa.admin.module.business.wms.base.item.service.impl.ItemQueryServiceImpl;
+import net.lab1024.sa.admin.module.business.wms.receive.asnDetail.domain.vo.AsnDetailVO;
 import net.lab1024.sa.admin.module.business.wms.shipping.pickDetail.dao.PickDetailDao;
 import net.lab1024.sa.admin.module.business.wms.shipping.pickDetail.domain.entity.PickDetailEntity;
 import net.lab1024.sa.admin.module.business.wms.shipping.pickDetail.domain.form.PickDetailQueryForm;
@@ -29,12 +32,25 @@ public class PickDetailQueryServiceImpl implements PickDetailQueryService {
     @Resource
     private PickDetailManager pickDetailManager;
 
+    @Resource
+    private ItemQueryServiceImpl itemQueryService;
+
     /**
      * 分页查询
      */
     public PageResult<PickDetailVO> queryPage(PickDetailQueryForm queryForm) {
         Page<?> page = SmartPageUtil.convert2PageQuery(queryForm);
         List<PickDetailVO> list = pickDetailDao.queryPage(page, queryForm);
+        // 查询物料名称
+        List<Long> itemIdList = list.stream().map(PickDetailVO::getItemId).toList();
+        Map<Long, ItemEntity> itemMap = itemQueryService.queryByItemIdsToMap(itemIdList);
+        list.forEach(pickDetailVO -> {
+            ItemEntity item = itemMap.get(pickDetailVO.getItemId());
+            if (item != null) {
+                pickDetailVO.setItemCode(item.getItemCode());
+                pickDetailVO.setItemName(item.getItemName());
+            }
+        });
         return SmartPageUtil.convert2PageResult(page, list);
     }
 

nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/task/domain/form/TaskQueryForm.java

@@ -20,4 +20,10 @@ public class TaskQueryForm extends PageParam {
     @Schema(description = "入库单")
     private Long asnId;
 
+    @Schema(description = "出库单")
+    private Long pickId;
+
+    @Schema(description = "任务类型")
+    private String taskType;
+
 }

nc_wms_java/sa-admin/src/main/resources/mapper/business/wms/shipping/pick/PickMapper.xml

@@ -9,7 +9,11 @@
         t_pick.customer_number,
         t_pick.order_type,
         t_pick.status,
+        t_pick.customer_id,
         t_pick.address_id,
+        t_pick.person,
+        t_pick.telephone,
+        t_pick.address,
         t_pick.order_quantity,
         t_pick.allocated_quantity,
         t_pick.picked_quantity,

nc_wms_java/sa-admin/src/main/resources/mapper/business/wms/task/TaskMapper.xml

@@ -4,10 +4,7 @@
 
     <!-- 查询结果列 -->
     <sql id="base_columns">
-        t_task
+        t_task.task_id,
-        .
-        task_id
-        ,
         t_task.bill_code,
         t_task.status,
         t_task.task_type,
@@ -44,6 +41,16 @@
             <if test="queryForm.asnId != null ">
                 AND t_task.asn_detail_id in (select asn_detail_id from t_asn_detail where asn_id = #{queryForm.asnId})
             </if>
+
+            <!--出库单-->
+            <if test="queryForm.pickId != null ">
+                AND t_task.pick_detail_id in (select pick_detail_id from t_pick_detail where pick_id =#{queryForm.pickId})
+            </if>
+
+            <!--任务类型-->
+            <if test="queryForm.taskType != null and queryForm.taskType != ''">
+                AND t_task.task_type = #{queryForm.taskType}
+            </if>
         </where>
     </select>