Merge branch 'dev' into dev_WMS20260401

mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/StockInOrder.java

@@ -356,4 +356,10 @@ public class StockInOrder extends BaseVOEntity {
     @ApiModelProperty("oms入库单id")
     @Excel(name = "oms入库单id")
     private String omsStockInOrderId;
+    @ApiModelProperty("结算币种")
+    private String settlementCurrency;
+    @ApiModelProperty("业务员ID")
+    private String salesmanId;
+    @ApiModelProperty("业务员名称")
+    private String salesmanName;
 }

mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/StockOutOrder.java

@@ -395,4 +395,11 @@ public class StockOutOrder extends BaseVOEntity {
     @Excel(name = "制单日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date documentDate;
 
+    @ApiModelProperty("结算币种")
+    private String settlementCurrency;
+    @ApiModelProperty("业务员ID")
+    private String salesmanId;
+    @ApiModelProperty("业务员名称")
+    private String salesmanName;
+
 }

mhd_bms/src/main/java/com/mhd/bms/domain/bmsInvoiceList/repository/persistence/BmsInvoiceListServiceImpl.java

@@ -195,6 +195,7 @@ public class BmsInvoiceListServiceImpl extends ServiceImpl<BmsInvoiceListMapper,
         List<Long> billManageIds = bmsInvoiceListAddDTO.getBillManageIds();
         if (billManageIds != null && billManageIds.size() > 0){
         } else {
+            billManageIds  = new  ArrayList<>();
             billManageIds.add(bmsInvoiceListAddDTO.getBillManageId());
         }
         List<BillManage> billManages = billManageMapper.selectList(new LambdaQueryWrapper<BillManage>().in(BillManage::getBillManageId, billManageIds));

sql/wkx.sql

@@ -457,4 +457,8 @@ COMMENT ON TABLE "NGWL_TEST_OMS"."RESERVATION_INVENTORY_ADJUSTMENT_RECORD" IS '
 -- ----------------------------
 -- Primary Key structure for table RESERVATION_INVENTORY_ADJUSTMENT_RECORD
 -- ----------------------------
-ALTER TABLE "NGWL_TEST_OMS"."RESERVATION_INVENTORY_ADJUSTMENT_RECORD" ADD PRIMARY KEY ("INVENTORY_ADJUSTMENT_ID");
+ALTER TABLE "NGWL_TEST_OMS"."RESERVATION_INVENTORY_ADJUSTMENT_RECORD" ADD PRIMARY KEY ("INVENTORY_ADJUSTMENT_ID");
+
+ALTER TABLE "NGWL_TEST_OMS"."RESERVATION_STOCK_IN_ORDER" ADD COLUMN "IN_QUANTITY" DECIMAL(20,2) DEFAULT 0.;
+
+COMMENT ON COLUMN "NGWL_TEST_OMS"."RESERVATION_STOCK_IN_ORDER"."IN_QUANTITY" IS '计划数量';