feat:新增出库单新增功能

nl-module-base/nl-module-base-server/src/main/resources/mapper/codegen/CodeSequenceMapper.xml

@@ -14,7 +14,8 @@
         VALUES (#{ruleId}, #{resetKey}, #{startAt} + #{step} - 1, #{maxValue})
         ON DUPLICATE KEY UPDATE
             current_value = current_value + #{step},
-            max_value = #{maxValue}
+            max_value = #{maxValue},
+            deleted = 0
     </update>
 
 </mapper>

nl-module-wms/nl-module-wms-server/src/main/java/cn/code/nl/module/wms/controller/admin/iostorinv/IostorInvController.java

@@ -41,7 +41,7 @@ public class IostorInvController {
     @PostMapping("/createOutbound")
     @Operation(summary = "创建出库单及明细")
     @PreAuthorize("@ss.hasPermission('wms:iostor-inv:create')")
-    public CommonResult<String> createOutbound(@Valid @RequestBody IostorInvCreateReqVO reqVO) {
+    public CommonResult<Long> createOutbound(@Valid @RequestBody IostorInvCreateReqVO reqVO) {
         return success(iostorInvService.createOutbound(reqVO));
     }
 
@@ -64,7 +64,7 @@ public class IostorInvController {
     @PostMapping("/create")
     @Operation(summary = "创建出入库单主表")
     @PreAuthorize("@ss.hasPermission('wms:iostor-inv:create')")
-    public CommonResult<String> createIostorInv(@Valid @RequestBody IostorInvSaveReqVO createReqVO) {
+    public CommonResult<Long> createIostorInv(@Valid @RequestBody IostorInvSaveReqVO createReqVO) {
         return success(iostorInvService.createIostorInv(createReqVO));
     }
 

nl-module-wms/nl-module-wms-server/src/main/java/cn/code/nl/module/wms/controller/admin/iostorinv/vo/IostorInvPageReqVO.java

@@ -8,6 +8,7 @@ import java.math.BigDecimal;
 import org.springframework.format.annotation.DateTimeFormat;
 import java.time.LocalDateTime;
 
+import static cn.code.nl.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY;
 import static cn.code.nl.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
 @Schema(description = "管理后台 - 出入库单主表分页 Request VO")
@@ -21,7 +22,7 @@ public class IostorInvPageReqVO extends PageParam {
     private String billType;
 
     @Schema(description = "业务日期")
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
     private LocalDateTime[] bizDate;
 
     @Schema(description = "仓库标识", example = "12635")
@@ -76,7 +77,7 @@ public class IostorInvPageReqVO extends PageParam {
     private String syscompanyid;
 
     @Schema(description = "是否已上传")
-    private String isUpload;
+    private Boolean isUpload;
 
     @Schema(description = "回传人", example = "25284")
     private String uploadOptid;

nl-module-wms/nl-module-wms-server/src/main/java/cn/code/nl/module/wms/controller/admin/iostorinv/vo/IostorInvRespVO.java

@@ -4,10 +4,13 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 import java.util.*;
 import java.math.BigDecimal;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.format.annotation.DateTimeFormat;
 import java.time.LocalDateTime;
 import cn.idev.excel.annotation.*;
 
+import static cn.code.nl.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY;
+
 @Schema(description = "管理后台 - 出入库单主表 Response VO")
 @Data
 @ExcelIgnoreUnannotated
@@ -23,12 +26,17 @@ public class IostorInvRespVO {
 
     @Schema(description = "业务日期", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("业务日期")
+    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY)
     private LocalDateTime bizDate;
 
     @Schema(description = "仓库标识", example = "12635")
     @ExcelProperty("仓库标识")
     private String storId;
 
+    @Schema(description = "仓库", example = "1号仓")
+    @ExcelProperty("仓库")
+    private String storName;
+
     @Schema(description = "来源方标识", example = "21190")
     @ExcelProperty("来源方标识")
     private String sourceId;

nl-module-wms/nl-module-wms-server/src/main/java/cn/code/nl/module/wms/controller/admin/iostorinvdtl/IostorinvDtlController.java

@@ -41,7 +41,7 @@ public class IostorinvDtlController {
     @PostMapping("/create")
     @Operation(summary = "创建出入库单明细")
     @PreAuthorize("@ss.hasPermission('wms:iostorinv-dtl:create')")
-    public CommonResult<String> createIostorinvDtl(@Valid @RequestBody IostorinvDtlSaveReqVO createReqVO) {
+    public CommonResult<Long> createIostorinvDtl(@Valid @RequestBody IostorinvDtlSaveReqVO createReqVO) {
         return success(iostorinvDtlService.createIostorinvDtl(createReqVO));
     }
 

nl-module-wms/nl-module-wms-server/src/main/java/cn/code/nl/module/wms/dal/dataobject/iostorinv/IostorInvDO.java

@@ -30,8 +30,8 @@ public class IostorInvDO extends BaseDO {
     /**
      * 出入单标识
      */
-    @TableId(type = IdType.INPUT)
+    @TableId
-    private String iostorinvId;
+    private Long iostorinvId;
     /**
      * 单据编号
      */

nl-module-wms/nl-module-wms-server/src/main/java/cn/code/nl/module/wms/dal/dataobject/iostorinvdtl/IostorinvDtlDO.java

@@ -17,22 +17,21 @@ import cn.code.nl.framework.mybatis.core.dataobject.BaseDO;
 @TableName("wms_iostorinvdtl")
 @KeySequence("wms_iostorinvdtl_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
 @Data
-@EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class IostorinvDtlDO extends BaseDO {
+public class IostorinvDtlDO {
 
     /**
      * 出入单明细标识
      */
-    @TableId(type = IdType.INPUT)
+    @TableId
-    private String iostorinvdtlId;
+    private Long iostorinvdtlId;
     /**
      * 出入单标识
      */
-    private String iostorinvId;
+    private Long iostorinvId;
     /**
      * 明细序号
      */
@@ -49,10 +48,7 @@ public class IostorinvDtlDO extends BaseDO {
      * 数量计量单位标识
      */
     private String qtyUnitId;
-    /**
+
-     * 数量计量单位名称
-     */
-    private String qtyUnitName;
     /**
      * 计划数量
      */

nl-module-wms/nl-module-wms-server/src/main/java/cn/code/nl/module/wms/dal/mysql/iostorinvdtl/IostorinvDtlMapper.java

@@ -54,7 +54,6 @@ public interface IostorinvDtlMapper extends BaseMapperX<IostorinvDtlDO> {
                 .eqIfPresent(IostorinvDtlDO::getPcsn, reqVO.getPcsn())
                 .eqIfPresent(IostorinvDtlDO::getBillStatus, reqVO.getBillStatus())
                 .eqIfPresent(IostorinvDtlDO::getQtyUnitId, reqVO.getQtyUnitId())
-                .likeIfPresent(IostorinvDtlDO::getQtyUnitName, reqVO.getQtyUnitName())
                 .eqIfPresent(IostorinvDtlDO::getPlanQty, reqVO.getPlanQty())
                 .eqIfPresent(IostorinvDtlDO::getRealQty, reqVO.getRealQty())
                 .eqIfPresent(IostorinvDtlDO::getSourceBilldtlId, reqVO.getSourceBilldtlId())

nl-module-wms/nl-module-wms-server/src/main/java/cn/code/nl/module/wms/service/iostorinv/IostorInvService.java

@@ -20,7 +20,7 @@ public interface IostorInvService {
      * @param reqVO 出库单创建信息
      * @return 出库单编号
      */
-    String createOutbound(@Valid IostorInvCreateReqVO reqVO);
+    Long createOutbound(@Valid IostorInvCreateReqVO reqVO);
 
     /**
      * 获得指定仓库的可用库存分页。
@@ -44,7 +44,7 @@ public interface IostorInvService {
      * @param createReqVO 创建信息
      * @return 编号
      */
-    String createIostorInv(@Valid IostorInvSaveReqVO createReqVO);
+    Long createIostorInv(@Valid IostorInvSaveReqVO createReqVO);
 
     /**
      * 更新出入库单主表

nl-module-wms/nl-module-wms-server/src/main/java/cn/code/nl/module/wms/service/iostorinv/IostorInvServiceImpl.java

@@ -53,7 +53,7 @@ public class IostorInvServiceImpl implements IostorInvService {
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public String createOutbound(IostorInvCreateReqVO reqVO) {
+    public Long createOutbound(IostorInvCreateReqVO reqVO) {
         Map<Long, AvailableInventoryRespVO> inventorySnapshot = validateAndLockInventory(reqVO);
 
         String ruleCode = "IO_CODE";
@@ -77,13 +77,12 @@ public class IostorInvServiceImpl implements IostorInvService {
                 .map(IostorInvCreateReqVO.Detail::getPlanQty)
                 .reduce(BigDecimal.ZERO, BigDecimal::add);
         IostorInvDO iostorInv = new IostorInvDO();
-        iostorInv.setIostorinvId(IdUtil.fastSimpleUUID());
         iostorInv.setBillCode(codeResult.getData());
-        iostorInv.setIoType("OUT");
+        iostorInv.setIoType("1");
         iostorInv.setBillType(reqVO.getBillType());
         iostorInv.setBizDate(reqVO.getBizDate());
         iostorInv.setStorId(reqVO.getStorId());
-        iostorInv.setBillStatus("生成");
+        iostorInv.setBillStatus("10");
         iostorInv.setRemark(reqVO.getRemark());
         iostorInv.setDetailCount(reqVO.getDetails().size());
         iostorInv.setTotalWeight(totalWeight);
@@ -92,7 +91,6 @@ public class IostorInvServiceImpl implements IostorInvService {
         for (int index = 0; index < reqVO.getDetails().size(); index++) {
             IostorInvCreateReqVO.Detail detail = reqVO.getDetails().get(index);
             IostorinvDtlDO detailDO = new IostorinvDtlDO();
-            detailDO.setIostorinvdtlId(IdUtil.fastSimpleUUID());
             detailDO.setIostorinvId(iostorInv.getIostorinvId());
             detailDO.setSeqNo(index + 1);
             AvailableInventoryRespVO inventory = inventorySnapshot.get(detail.getGroupId());
@@ -102,8 +100,8 @@ public class IostorInvServiceImpl implements IostorInvService {
             detailDO.setPlanQty(detail.getPlanQty());
             detailDO.setUnassignQty(detail.getPlanQty());
             detailDO.setAssignQty(BigDecimal.ZERO);
+            detailDO.setBillStatus("10");
             detailDO.setQtyUnitId(inventory == null ? detail.getQtyUnitId() : inventory.getQtyUnitId());
-            detailDO.setQtyUnitName(inventory == null ? detail.getQtyUnitName() : inventory.getQtyUnitName());
             detailDO.setSourceBillCode(inventory == null ? detail.getSourceBillCode() : inventory.getExtCode());
             detailDO.setSourceBillType(inventory == null ? detail.getSourceBillType() : inventory.getExtType());
             detailDO.setSourceBilldtlId(inventory == null ? detail.getSourceBilldtlId() : inventory.getExtDtlCode());
@@ -175,7 +173,7 @@ public class IostorInvServiceImpl implements IostorInvService {
     }
 
     @Override
-    public String createIostorInv(IostorInvSaveReqVO createReqVO) {
+    public Long createIostorInv(IostorInvSaveReqVO createReqVO) {
         // 插入
         IostorInvDO iostorInv = BeanUtils.toBean(createReqVO, IostorInvDO.class);
         iostorInvMapper.insert(iostorInv);

nl-module-wms/nl-module-wms-server/src/main/java/cn/code/nl/module/wms/service/iostorinvdtl/IostorinvDtlService.java

@@ -20,7 +20,7 @@ public interface IostorinvDtlService {
      * @param createReqVO 创建信息
      * @return 编号
      */
-    String createIostorinvDtl(@Valid IostorinvDtlSaveReqVO createReqVO);
+    Long createIostorinvDtl(@Valid IostorinvDtlSaveReqVO createReqVO);
 
     /**
      * 更新出入库单明细

nl-module-wms/nl-module-wms-server/src/main/java/cn/code/nl/module/wms/service/iostorinvdtl/IostorinvDtlServiceImpl.java

@@ -33,7 +33,7 @@ public class IostorinvDtlServiceImpl implements IostorinvDtlService {
     private IostorinvDtlMapper iostorinvDtlMapper;
 
     @Override
-    public String createIostorinvDtl(IostorinvDtlSaveReqVO createReqVO) {
+    public Long createIostorinvDtl(IostorinvDtlSaveReqVO createReqVO) {
         // 插入
         IostorinvDtlDO iostorinvDtl = BeanUtils.toBean(createReqVO, IostorinvDtlDO.class);
         iostorinvDtlMapper.insert(iostorinvDtl);

nl-module-wms/nl-module-wms-server/src/main/resources/application.yaml

@@ -65,10 +65,10 @@ mybatis-plus:
     map-underscore-to-camel-case: true # 虽然默认为 true ，但是还是显示去指定下。
   global-config:
     db-config:
-      id-type: NONE # “智能”模式，基于 IdTypeEnvironmentPostProcessor + 数据源的类型，自动适配成 AUTO、INPUT 模式。
+      #      id-type: NONE # “智能”模式，基于 IdTypeEnvironmentPostProcessor + 数据源的类型，自动适配成 AUTO、INPUT 模式。
       #      id-type: AUTO # 自增 ID，适合 MySQL 等直接自增的数据库
       #      id-type: INPUT # 用户输入 ID，适合 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库
-#      id-type: ASSIGN_ID # 分配 ID，默认使用雪花算法。注意，Oracle、PostgreSQL、Kingbase、DB2、H2 数据库时，需要去除实体类上的 @KeySequence 注解
+      id-type: ASSIGN_ID # 分配 ID，默认使用雪花算法。注意，Oracle、PostgreSQL、Kingbase、DB2、H2 数据库时，需要去除实体类上的 @KeySequence 注解
       logic-delete-value: 1 # 逻辑已删除值(默认为 1)
       logic-not-delete-value: 0 # 逻辑未删除值(默认为 0)
     banner: false # 关闭控制台的 Banner 打印

nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/apps/web-antdv-next/src/views/wms/iostorinv/data.ts

@@ -3,6 +3,16 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { WmsIostorInvApi } from '#/api/wms/iostorinv';
 
 import { getRangePickerDefaultProps } from '#/utils';
+import { getBsrealStorAttrSimpleList } from '#/api/wms/bsrealstorattr';
+import {getDictOptions} from "@vben/hooks";
+import {DICT_TYPE} from "@vben/constants";
+
+
+// ========== 启用的仓库下拉 ==========
+async function loadWarehouseList() {
+  const data = await getBsrealStorAttrSimpleList();
+  return data || [];
+}
 
 /** 新增/修改的表单 */
 export function useFormSchema(): VbenFormSchema[] {
@@ -260,7 +270,7 @@ export function useGridFormSchema(): VbenFormSchema[] {
       component: 'Select',
       componentProps: {
         allowClear: true,
-        options: [],
+        options: getDictOptions(DICT_TYPE.WMS_OUT_BILL_TYPE),
         placeholder: '请选择单据类型',
       },
     },
@@ -275,11 +285,14 @@ export function useGridFormSchema(): VbenFormSchema[] {
     },
     {
       fieldName: 'storId',
-      label: '仓库标识',
+      label: '仓库',
-      component: 'Input',
+      component: 'ApiSelect',
       componentProps: {
+        api: loadWarehouseList,
+        labelField: 'storName',
+        valueField: 'storId',
+        placeholder: '请选择仓库',
         allowClear: true,
-        placeholder: '请输入仓库标识',
       },
     },
     {
@@ -288,7 +301,7 @@ export function useGridFormSchema(): VbenFormSchema[] {
       component: 'Select',
       componentProps: {
         allowClear: true,
-        options: [],
+        options: getDictOptions(DICT_TYPE.WMS_IO_BILL_STATUS),
         placeholder: '请选择单据状态',
       },
     },
@@ -303,11 +316,12 @@ export function useGridFormSchema(): VbenFormSchema[] {
     },
     {
       fieldName: 'isUpload',
-      label: '是否已回传',
+      label: '是否回传',
-      component: 'Input',
+      component: 'Select',
       componentProps: {
         allowClear: true,
-        placeholder: '请输入是否已回传',
+        options: getDictOptions(DICT_TYPE.COMMON_TRUE_FALSE, 'boolean'),
+        placeholder: '请选择是否回传',
       },
     }
   ];
@@ -331,11 +345,11 @@ export function useGridColumns(): VxeTableGridOptions<WmsIostorInvApi.IostorInv>
       field: 'bizDate',
       title: '业务日期',
       minWidth: 120,
-      formatter: 'formatDateTime',
+      formatter: 'formatDate',
     },
     {
-      field: 'storId',
+      field: 'storName',
-      title: '仓库标识',
+      title: '仓库',
       minWidth: 120,
     },
     {
@@ -372,6 +386,10 @@ export function useGridColumns(): VxeTableGridOptions<WmsIostorInvApi.IostorInv>
       field: 'billStatus',
       title: '单据状态',
       minWidth: 120,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.WMS_IO_BILL_STATUS },
+      },
     },
     {
       field: 'remark',
@@ -382,6 +400,10 @@ export function useGridColumns(): VxeTableGridOptions<WmsIostorInvApi.IostorInv>
       field: 'createMode',
       title: '生成方式',
       minWidth: 120,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.WMS_CREATE_TYPE },
+      },
     },
     {
       field: 'createTime',
@@ -444,4 +466,3 @@ export function useGridColumns(): VxeTableGridOptions<WmsIostorInvApi.IostorInv>
     },
   ];
 }
-

nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/packages/constants/src/dict-enum.ts

@@ -287,6 +287,9 @@ const WMS_DICT = {
   WMS_GROUP_PLATE_STATUS: 'wms_group_plate_status', // 组盘记录
   WMS_VEHICLE_TYPE: 'wms_vehicle_type', // 载具类型
   WMS_OVER_STRUCT_TYPE: 'wms_over_struct_type', // 是否超限
+  WMS_OUT_BILL_TYPE: 'wms_out_bill_type', // 出库单据类型
+  WMS_IO_BILL_STATUS: 'wms_io_bill_status', // 出入库单据状态
+  WMS_CREATE_TYPE: 'wms_create_type', // 生成方式
 } as const;
 
 /** ========== TASK - 任务管理模块 ========== */