diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java index 9a7a2fab9..10d1f72d5 100644 --- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java +++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java @@ -2,10 +2,7 @@ package com.mhd.system.api; import com.mhd.common.core.constant.ServiceNameConstants; import com.mhd.common.core.web.domain.AjaxResult; -import com.mhd.system.api.domain.InMaterialDetail; -import com.mhd.system.api.domain.OutMaterialDetail; -import com.mhd.system.api.domain.StockInOrder; -import com.mhd.system.api.domain.StockOutOrder; +import com.mhd.system.api.domain.*; import com.mhd.system.api.factory.RemoteBmsFeignFallbackFactory; import com.mhd.system.api.feign.FeignAutoConfiguration; import io.swagger.annotations.ApiOperation; @@ -33,4 +30,8 @@ public interface OmsServiceFeign { @ApiOperation("wms推送入库单明细") @PostMapping(value = "/reservationStockOutOrderApi/pushOutOrderDetail") public AjaxResult pushOutOrderDetail(@RequestBody OutMaterialDetail outMaterialDetail); + + @ApiOperation("编辑物料库存") + @PostMapping("/materialInventoryApi/omsEdit") + public AjaxResult omsEdit(@RequestBody MaterialInventoryOmsParamDO materialInventoryOmsParamDO); } \ No newline at end of file diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/MaterialInventoryOmsParamDO.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/MaterialInventoryOmsParamDO.java new file mode 100644 index 000000000..c42b3a996 --- /dev/null +++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/MaterialInventoryOmsParamDO.java @@ -0,0 +1,79 @@ +package com.mhd.system.api.domain; + +import com.mhd.common.core.web.domain.BaseVOEntity; +import com.mhd.system.api.model.LoginUser; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + + +/** + * 物料库存对象 material_inventory + * + * @author gen + * @date 2024-05-29 + */ + +@Data +public class MaterialInventoryOmsParamDO extends BaseVOEntity { + private static final long serialVersionUID = 1L; + //库存id + private Long materialInventoryId; + //物料基础信息id + private Long materialBaseInfoId; + //物料明细ID + private Long materialDetailId; + //仓库信息参数 + private Long organizationId; + private String organizationName; + private Long topOrganizationId; + //仓库ID + private Long warehouseId; + //仓库编码 + private String warehouseCode; + //仓库名称 + private String warehouseName; + //存储区ID + private Long storageSectionId; + //存储区编码 + private String storageCode; + //存储区名称 + private String storageName; + //存储位置ID + private Long storageLocationId; + //存储位置编码 + private String storageLocationCode; + //存储位置名称 + private String storageLocationName; + //调整数量 + private BigDecimal quantity; + //净重 + private BigDecimal netWeight; + //毛重 + private BigDecimal grossWeight; + //体积 + private BigDecimal volume; + //面积 + private BigDecimal area; + //类型(1:上架2:分配3:取消分配4:出库交接5:移位6:库存调整7:库存冻结) + private String type; + + private String barCode; + + private String inOrderNumber; + + private String lotNumber; + + private String batchNumber; + + private String isNew; + + /** 业务关联单号（出库单号、交接单对应单号等），用于库存调整记录 relate_no；可与入库单号区分 */ + private String relateNo; + + private String kctzType; + + private LoginUser loginUser; + +} \ No newline at end of file diff --git a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/UserPo.java b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/UserPo.java index c801c53d7..5a4143bb1 100644 --- a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/UserPo.java +++ b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/UserPo.java @@ -203,7 +203,7 @@ public class UserPo { private Integer esignEnterpriseStatus; @ApiModelProperty(name = "部门ID") - private Integer departmentId; + private String departmentId; @ApiModelProperty(name = "钉钉user_id") private String dingUserId; diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/scheduledTask/repository/persistence/ScheduledTaskServiceImpl.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/scheduledTask/repository/persistence/ScheduledTaskServiceImpl.java index 53fd369ed..4248b2f9b 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/scheduledTask/repository/persistence/ScheduledTaskServiceImpl.java +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/scheduledTask/repository/persistence/ScheduledTaskServiceImpl.java @@ -73,6 +73,7 @@ public class ScheduledTaskServiceImpl extends ServiceImpl + \ No newline at end of file diff --git a/mhd_oms/src/main/resources/mapper/reservationInventoryAdjustmentRecord/InventoryAdjustmentRecordMapper.xml b/mhd_oms/src/main/resources/mapper/reservationInventoryAdjustmentRecord/InventoryAdjustmentRecordMapper.xml new file mode 100644 index 000000000..6dec04c8d --- /dev/null +++ b/mhd_oms/src/main/resources/mapper/reservationInventoryAdjustmentRecord/InventoryAdjustmentRecordMapper.xml @@ -0,0 +1,202 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select a.inventory_adjustment_id, a.organization_id, a.organization_name, a.top_organization_id, a.material_inventory_id, + a.material_base_info_id, a.material_code, a.material_name, a.bar_code, a.shipper_id, a.shipper_name, a.warehouse_id, + a.warehouse_code, a.warehouse_name, a.storage_section_id, a.storage_code, a.storage_name, a.storage_location_id, + a.storage_location_code, a.storage_location_name, a.adjust_type, a.adjust_direction, a.adjust_before_status_code, + a.adjust_before_status_name, a.adjust_after_status_code, a.adjust_after_status_name, a.inventory_before_quantity, + a.allocation_before_quantity, a.freeze_before_quantity, a.inventory_after_quantity, a.allocation_after_quantity, + a.freeze_after_quantity, a.create_time, a.create_by, a.create_by_name, a.update_time, a.update_by, a.update_by_name, + a.del_flag,a.net_weight, + a.gross_weight, + a.volume, + a.area, + a.adjusted_net_weight, + a.adjusted_gross_weight, + a.adjusted_volume, + a.adjusted_area, + b.ext_attr_1, b.ext_attr_2, b.ext_attr_3, b.ext_attr_4, + b.production_date, b.expiry_date, b.inventory_date, + b.batch_ref_no, b.sheet_ref_no, b.box_pallet_no,a.ADJUST_ACTION,a.RELATE_NO, + a.in_order_number,a.lot_number,b.batch_number + from inventory_adjustment_record a left join material_inventory b on a.material_inventory_id = b.material_inventory_id + where a.del_flag = 1 + + + + + and a.organization_id = #{organizationId} + + + and a.organization_name like concat('%', #{organizationName}, '%') + + + and a.top_organization_id = #{topOrganizationId} + + + and a.material_base_info_id = #{materialBaseInfoId} + + + and a.material_inventory_id = #{materialInventoryId} + + + and a.material_code = #{materialCode} + + + and a.adjust_action = #{adjustAction} + + + and a.relate_no = #{relateNo} + + + and a.material_name like concat('%', #{materialName}, '%') + + + and a.bar_code = #{barCode} + + + and a.shipper_id = #{shipperId} + + + and a.shipper_name like concat('%', #{shipperName}, '%') + + + and a.warehouse_id = #{warehouseId} + + + and a.warehouse_code = #{warehouseCode} + + + and a.warehouse_name like concat('%', #{warehouseName}, '%') + + + and a.storage_section_id = #{storageSectionId} + + + and a.storage_code = #{storageCode} + + + and a.storage_name like concat('%', #{storageName}, '%') + + + and a.storage_location_id = #{storageLocationId} + + + and a.storage_location_code = #{storageLocationCode} + + + and a.storage_location_name like concat('%', #{storageLocationName}, '%') + + + and a.adjust_type = #{adjustType} + + + and a.adjust_direction = #{adjustDirection} + + + and a.adjust_before_status_code = #{adjustBeforeStatusCode} + + + and a.adjust_before_status_name = #{adjustBeforeStatusName} + + + and a.adjust_after_status_code = #{adjustAfterStatusCode} + + + and a.adjust_after_status_name = #{adjustAfterStatusName} + + + and a.inventory_before_quantity = #{inventoryBeforeQuantity} + + + and a.allocation_before_quantity = #{allocationBeforeQuantity} + + + and a.freeze_before_quantity = #{freezeBeforeQuantity} + + + and a.inventory_after_quantity = #{inventoryAfterQuantity} + + + and a.allocation_after_quantity = #{allocationAfterQuantity} + + + and a.freeze_after_quantity = #{freezeAfterQuantity} + + + and a.create_by_name like concat('%', #{createByName}, '%') + + + and a.update_by_name like concat('%', #{updateByName}, '%') + + order by a.create_time desc + + + + \ No newline at end of file diff --git a/mhd_oms/src/main/resources/mapper/reservationMaterialInventory/MaterialInventoryMapper.xml b/mhd_oms/src/main/resources/mapper/reservationMaterialInventory/MaterialInventoryMapper.xml new file mode 100644 index 000000000..dddb25bcb --- /dev/null +++ b/mhd_oms/src/main/resources/mapper/reservationMaterialInventory/MaterialInventoryMapper.xml @@ -0,0 +1,404 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + a.material_inventory_id, a.organization_id, a.organization_name, a.top_organization_id, + a.shipper_id, a.shipper_code, a.shipper_name, + a.warehouse_id, a.warehouse_code, a.warehouse_name, + a.storage_section_id, a.storage_code, a.storage_name, a.storage_location_id, a.storage_location_code, a.storage_location_name, a.material_base_info_id,a.material_detail_id, + a.batch_number,a.material_status_code,a.material_status_name,a.container_id,a.container_code,a.container_type,a.container_type_name + ,IFNULL (sum(a.freeze_quantity), 0) freeze_quantity,a.is_able, + IFNULL (sum(a.inventory_quantity), 0) inventory_quantity, + IFNULL (sum(a.allocation_quantity), 0) allocation_quantity, + a.remark, a.create_time, a.create_by, a.create_by_name, a.update_time, a.update_by, a.update_by_name, + a.del_flag,a.unit, + IFNULL (sum(a.area), 0) area, + IFNULL (sum(a.NET_WEIGHT), 0) NET_WEIGHT, + IFNULL (sum(a.GROSS_WEIGHT), 0) GROSS_WEIGHT, + IFNULL (sum(a.VOLUME), 0) VOLUME, + a.ext_attr_1, a.ext_attr_2, a.ext_attr_3, a.ext_attr_4, + a.production_date, a.expiry_date, a.inventory_date, + a.BATCH_REF_NO, a.SHEET_REF_NO, a.BOX_PALLET_NO,nvl(a.unit_name,b.unit_name) as unit_name, + a.bar_code as inv_bar_code, + a.in_order_number,a.lot_number + + + + + and a.material_inventory_id = #{materialInventoryId} + + + and a.organization_id = #{organizationId} + + + and a.organization_name like concat('%', #{organizationName}, '%') + + + and a.top_organization_id = #{topOrganizationId} + + + and a.warehouse_id = #{warehouseId} + + + and a.shipper_id = #{shipperId} + + + and a.warehouse_code = #{warehouseCode} + + + and a.warehouse_name like concat('%', #{warehouseName}, '%') + + + and a.storage_section_id = #{storageSectionId} + + + and a.storage_code = #{storageCode} + + + and a.storage_name like concat('%', #{storageName}, '%') + + + and a.storage_location_id = #{storageLocationId} + + + and a.storage_location_code = #{storageLocationCode} + + + and a.storage_location_name like concat('%', #{storageLocationName}, '%') + + + and a.material_base_info_id = #{materialBaseInfoId} + + + and a.material_detail_id, = #{materialDetailId} + + + + + and (a.container_code like concat('%', #{containerOrBatch}, '%') or a.batch_number like concat('%', #{containerOrBatch}, '%')) + + + and (a.batch_number like concat('%', #{batchNumber}, '%') or a.container_code like concat('%', #{containerCode}, '%')) + + + + and a.batch_number like concat('%', #{batchNumber}, '%') + + + and a.container_code like concat('%', #{containerCode}, '%') + + + + + and a.material_status_code like concat('%', #{materialStatusCode}, '%') + + + and a.material_status_name like concat('%', #{materialStatusName}, '%') + + + and a.container_id = #{containerId} + + + and a.container_type like concat('%', #{containerType}, '%') + + + and a.container_type_name like concat('%', #{containerTypeName}, '%') + + + and a.inventory_quantity = #{inventoryQuantity} + and a.inventory_quantity != 0 + + + and a.allocation_quantity = #{allocationQuantity} + + + and a.freeze_quantity = #{freezeQuantity} + + + + and a.create_by_name like concat('%', #{createByName}, '%') + + + and a.update_by_name like concat('%', #{updateByName}, '%') + + + and a.del_flag = #{delFlag} + and a.del_flag = 1 + + + and (a.storage_location_code = #{storageInfo} or material_code = #{storageInfo} or material_name like concat('%', #{storageInfo}, '%') or bar_code = #{storageInfo}) + + + and a.BATCH_REF_NO like concat('%', #{batchRefNo}, '%') + + + and a.SHEET_REF_NO like concat('%', #{sheetRefNo}, '%') + + + and a.BOX_PALLET_NO like concat('%', #{boxPalletNo}, '%') + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + group by a.shipper_id + order by max(a.shipper_name) + + + group by b.material_base_info_id, a.shipper_id + order by max(b.material_name), max(a.shipper_name) + + + group by b.material_base_info_id, a.shipper_id, a.batch_number + order by max(b.material_name), max(a.shipper_name), a.batch_number + + + group by a.storage_location_id + order by max(a.storage_location_code) + + + group by b.material_base_info_id, a.storage_location_id, a.shipper_id + order by max(b.material_name), max(a.storage_location_code), max(a.shipper_name) + + + group by a.container_id, a.container_code, a.container_type, a.container_type_name + order by a.container_type_name, b.material_name, a.storage_location_name + + + group by a.material_inventory_id + order by a.shipper_name, b.material_name, a.storage_location_name, a.batch_number + + + + + + + + + + + + + \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/service/HandoverTaskOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/service/HandoverTaskOrderDomainService.java index fbceee889..f28f210ac 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/service/HandoverTaskOrderDomainService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/service/HandoverTaskOrderDomainService.java @@ -8,6 +8,8 @@ import com.mhd.common.core.exception.ServiceException; import com.mhd.common.core.utils.OrderSequence; import com.mhd.common.core.utils.bean.BeanUtils; import com.mhd.common.security.utils.SecurityUtils; +import com.mhd.system.api.OmsServiceFeign; +import com.mhd.system.api.domain.MaterialInventoryOmsParamDO; import com.mhd.system.api.model.LoginUser; import com.mhd.wms.domain.copyCodeReference.entity.CopyCodeReference; import com.mhd.wms.domain.copyCodeReference.repository.facade.ICopyCodeReferenceService; @@ -81,6 +83,8 @@ public class HandoverTaskOrderDomainService { private IStockOutOrderService stockOutOrderService; @Autowired private CopyCodeReferenceDomainService copyCodeReferenceDomainService; + @Autowired + private OmsServiceFeign omsServiceFeign; /** @@ -427,6 +431,12 @@ public class HandoverTaskOrderDomainService { materialInventoryParamDO.setType("4"); materialInventoryService.kctzjl(materialInventoryParamDO,"出库",loginUser); materialInventoryService.xgkc(materialInventoryParamDO); + MaterialInventoryOmsParamDO materialInventoryOmsParamDO = new MaterialInventoryOmsParamDO(); + BeanUtils.copyProperties(materialInventoryParamDO, materialInventoryOmsParamDO); + materialInventoryOmsParamDO.setKctzType("出库"); + materialInventoryOmsParamDO.setLoginUser(loginUser); + //库存推送oms + omsServiceFeign.omsEdit(materialInventoryOmsParamDO); //库存调整记录 // InventoryAdjustmentRecord inventoryAdjustmentRecord = new InventoryAdjustmentRecord(); // inventoryAdjustmentRecord.setAdjustAction("出库"); diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/inventoryAdjustmentRecord/service/InventoryAdjustmentRecordDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/inventoryAdjustmentRecord/service/InventoryAdjustmentRecordDomainService.java index 5afbda11b..e8cf5ed71 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/inventoryAdjustmentRecord/service/InventoryAdjustmentRecordDomainService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/inventoryAdjustmentRecord/service/InventoryAdjustmentRecordDomainService.java @@ -11,6 +11,7 @@ import com.mhd.common.core.web.domain.BaseVOEntity; import com.mhd.common.security.utils.SecurityUtils; import com.mhd.system.api.OmsServiceFeign; import com.mhd.system.api.domain.InMaterialDetail; +import com.mhd.system.api.domain.MaterialInventoryOmsParamDO; import com.mhd.system.api.domain.OutMaterialDetail; import com.mhd.system.api.domain.StockOutOrder; import com.mhd.system.api.model.LoginUser; @@ -466,6 +467,11 @@ public class InventoryAdjustmentRecordDomainService { materialInventoryParamDO.setType("7"); materialInventoryService.kctzjl(materialInventoryParamDO,"库存冻结",loginUser); materialInventoryService.xgkc(materialInventoryParamDO); + MaterialInventoryOmsParamDO materialInventoryOmsParamDO = new MaterialInventoryOmsParamDO(); + BeanUtils.copyProperties(materialInventoryParamDO, materialInventoryOmsParamDO); + materialInventoryOmsParamDO.setKctzType("库存冻结"); + materialInventoryOmsParamDO.setLoginUser(loginUser); + omsServiceFeign.omsEdit(materialInventoryOmsParamDO); return true; } catch (Exception e) { e.printStackTrace(); diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/persistence/MaterialInventoryImpl.java b/mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/persistence/MaterialInventoryImpl.java index 7dab18412..9a5be85bc 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/persistence/MaterialInventoryImpl.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/persistence/MaterialInventoryImpl.java @@ -584,9 +584,23 @@ public class MaterialInventoryImpl extends ServiceImpl public void updateOmsOrder(@Param("orderNumber") String orderNumber, @Param("status") Integer status, @Param("shelvesQuantity") Integer shelvesQuantity); - void updateOmsDocument(BigDecimal shelvesQuantity, BigDecimal totalNetWeight, String omsInMaterialDetail); + void updateOmsDocument(@Param("shelvesQuantity") BigDecimal shelvesQuantity, @Param("totalNetWeight") BigDecimal totalNetWeight, @Param("omsInMaterialDetail") String omsInMaterialDetail); - void updateOmsHandover(BigDecimal checkQuantity, BigDecimal totalNetWeight, String outOrderNumber, Long uniqueId); + void updateOmsHandover(@Param("checkQuantity") BigDecimal checkQuantity, @Param("totalNetWeight") BigDecimal totalNetWeight, @Param("outOrderNumber") String outOrderNumber, @Param("uniqueId") Long uniqueId); - void updateOmsDocumentLot(BigDecimal shelvesQuantity, BigDecimal totalNetWeight, String lotNumber); + void updateOmsDocumentLot(@Param("shelvesQuantity") BigDecimal shelvesQuantity, @Param("totalNetWeight") BigDecimal totalNetWeight, @Param("lotNumber") String lotNumber); } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/service/StockShelfOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/service/StockShelfOrderDomainService.java index d4133b64d..54d9986a2 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/service/StockShelfOrderDomainService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/service/StockShelfOrderDomainService.java @@ -19,8 +19,10 @@ import com.mhd.common.core.utils.bean.BeanUtils; import com.mhd.common.core.utils.uuid.IdGenerator; import com.mhd.common.core.web.domain.AjaxResult; import com.mhd.common.security.utils.SecurityUtils; +import com.mhd.system.api.OmsServiceFeign; import com.mhd.system.api.SystemServiceFeign; import com.mhd.system.api.domain.ContainerFeignPO; +import com.mhd.system.api.domain.MaterialInventoryOmsParamDO; import com.mhd.system.api.model.LoginUser; import com.mhd.wms.domain.containerUsageRecord.repository.facade.IContainerUsageRecordService; import com.mhd.wms.domain.containerUsageRecord.repository.todo.ContainerUsageRecordDO; @@ -135,6 +137,8 @@ public class StockShelfOrderDomainService { private MaterialBaseInfoMapper materialBaseInfoMapper; @Autowired private ICopyCodeReferenceService copyCodeReferenceService; + @Autowired + private OmsServiceFeign omsServiceFeign; /** * 分页查询上架单列表 @@ -1068,6 +1072,11 @@ public class StockShelfOrderDomainService { //库存调整记录 materialInventoryService.xgkc(inventoryParamDO); materialInventoryService.kctzjl(inventoryParamDO,"入库", loginUser); + MaterialInventoryOmsParamDO materialInventoryOmsParamDO = new MaterialInventoryOmsParamDO(); + BeanUtils.copyProperties(inventoryParamDO, materialInventoryOmsParamDO); + materialInventoryOmsParamDO.setKctzType("入库"); + materialInventoryOmsParamDO.setLoginUser(loginUser); + omsServiceFeign.omsEdit(materialInventoryOmsParamDO); //抄码商品对照数据插入 copyCodeProductComparison(materialBaseInfo,shelfMaterialDetail,inventoryParamDO); } else if (materialInventoryPOS.size() == 1) { @@ -1125,6 +1134,11 @@ public class StockShelfOrderDomainService { //库存调整记录 materialInventoryService.kctzjl(inventoryParamDO, "入库", loginUser); materialInventoryService.xgkc(inventoryParamDO); + MaterialInventoryOmsParamDO materialInventoryOmsParamDO = new MaterialInventoryOmsParamDO(); + BeanUtils.copyProperties(inventoryParamDO, materialInventoryOmsParamDO); + materialInventoryOmsParamDO.setKctzType("入库"); + materialInventoryOmsParamDO.setLoginUser(loginUser); + omsServiceFeign.omsEdit(materialInventoryOmsParamDO); //抄码商品对照数据插入 copyCodeProductComparison(materialBaseInfo,shelfMaterialDetail,inventoryParamDO); } diff --git a/mhd_wms/src/main/resources/mapper/stockOutOrder/StockOutOrderMapper.xml b/mhd_wms/src/main/resources/mapper/stockOutOrder/StockOutOrderMapper.xml index dfe30c152..f15e0c51e 100644 --- a/mhd_wms/src/main/resources/mapper/stockOutOrder/StockOutOrderMapper.xml +++ b/mhd_wms/src/main/resources/mapper/stockOutOrder/StockOutOrderMapper.xml @@ -93,6 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -110,7 +111,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" a.CUSTOMS_DECLARER_INFO,a.DELIVERY_ADDR,a.ENTRY_EXIT_CUSTOMS,a.DEPARTURE_ARRIVAL_COUNTRY,a.CARRIER,a.CONTAINER_NO,a.CONTAINER_NO_NAME,a.OUTBOUND_DATE, a.COMPLETE_TIME,a.ORDER_DATE,a.TRANSPORT_MODE_CODE,a.TRANSPORT_MODE_NAME,a.SUPERVISION_MODE_CODE,a.SUPERVISION_MODE_NAME, a.CUSTOMS_INSPECTION_FLAG,a.NEED_DECLARE_FLAG,a.NEED_TRANSPORT_FLAG,a.picture_app,a.billing_json,a.SETTLEMENT_CURRENCY, - a.SALESMAN_ID,a.SALESMAN_NAME + a.SALESMAN_ID,a.SALESMAN_NAME,a.business_order_no diff --git a/sql/wkx.sql b/sql/wkx.sql index e118e8497..e24502278 100644 --- a/sql/wkx.sql +++ b/sql/wkx.sql @@ -176,4 +176,285 @@ COMMENT ON COLUMN "NGWL_TEST_WMS"."OUT_MATERIAL_DETAIL"."CONTRACT_FEE" IS '合 COMMENT ON COLUMN "NGWL_TEST_WMS"."OUT_MATERIAL_DETAIL"."STOCK_UNIT" IS '库存单位'; -COMMENT ON COLUMN "NGWL_TEST_WMS"."OUT_MATERIAL_DETAIL"."STOCK_QUANTITY" IS '库存件数' \ No newline at end of file +COMMENT ON COLUMN "NGWL_TEST_WMS"."OUT_MATERIAL_DETAIL"."STOCK_QUANTITY" IS '库存件数' + +----------------------------------已发布生产---------------------------------------- + +/* + Navicat Premium Dump SQL + + Source Server : 113.44.106.61 + Source Server Type : Dameng + Source Server Version : 8014116 (08.01.4116) + Source Host : 113.44.106.61:5236 + Source Schema : NGWL_TEST_OMS + + Target Server Type : Dameng + Target Server Version : 8014116 (08.01.4116) + File Encoding : 65001 + + Date: 22/04/2026 08:57:55 +*/ + + +-- ---------------------------- +-- Table structure for RESERVATION_MATERIAL_INVENTORY +-- ---------------------------- +DROP TABLE IF EXISTS "NGWL_TEST_OMS"."RESERVATION_MATERIAL_INVENTORY"; +CREATE TABLE "NGWL_TEST_OMS"."RESERVATION_MATERIAL_INVENTORY" ( + "RESERVATION_MATERIAL_INVENTORY_ID" BIGINT IDENTITY(1,1) NOT NULL, + "ORGANIZATION_ID" BIGINT DEFAULT 0, + "ORGANIZATION_NAME" VARCHAR(100 CHAR) DEFAULT '', + "TOP_ORGANIZATION_ID" BIGINT DEFAULT 0, + "MATERIAL_BASE_INFO_ID" BIGINT DEFAULT 0, + "MATERIAL_DETAIL_ID" BIGINT, + "WAREHOUSE_ID" BIGINT DEFAULT 0, + "WAREHOUSE_CODE" VARCHAR(32 CHAR) DEFAULT '', + "WAREHOUSE_NAME" VARCHAR(64 CHAR) DEFAULT '', + "STORAGE_SECTION_ID" BIGINT DEFAULT 0, + "STORAGE_CODE" VARCHAR(32 CHAR) DEFAULT '', + "STORAGE_NAME" VARCHAR(64 CHAR) DEFAULT '', + "STORAGE_LOCATION_ID" BIGINT DEFAULT 0, + "STORAGE_LOCATION_CODE" VARCHAR(32 CHAR) DEFAULT '', + "STORAGE_LOCATION_NAME" VARCHAR(64 CHAR) DEFAULT '', + "BATCH_NUMBER" VARCHAR(50 CHAR) DEFAULT '', + "MATERIAL_STATUS_CODE" VARCHAR(32 CHAR) DEFAULT '', + "MATERIAL_STATUS_NAME" VARCHAR(64 CHAR) DEFAULT '', + "CONTAINER_ID" BIGINT DEFAULT 0 NOT NULL, + "CONTAINER_CODE" VARCHAR(32 CHAR) DEFAULT '', + "CONTAINER_TYPE" VARCHAR(32 CHAR) DEFAULT '', + "CONTAINER_TYPE_NAME" VARCHAR(64 CHAR) DEFAULT '', + "INVENTORY_QUANTITY" DECIMAL(20,2) DEFAULT 0., + "ALLOCATION_QUANTITY" DECIMAL(20,2) DEFAULT 0., + "FREEZE_QUANTITY" DECIMAL(20,2) DEFAULT 0., + "REMARK" VARCHAR(255 CHAR) DEFAULT '', + "CREATE_TIME" TIMESTAMP, + "CREATE_BY" BIGINT DEFAULT 0, + "CREATE_BY_NAME" VARCHAR(20 CHAR) DEFAULT '', + "UPDATE_TIME" TIMESTAMP, + "UPDATE_BY" BIGINT DEFAULT 0, + "UPDATE_BY_NAME" VARCHAR(20 CHAR) DEFAULT '', + "DEL_FLAG" TINYINT DEFAULT 1, + "IS_ABLE" TINYINT DEFAULT 1, + "UNIT" VARCHAR2(128), + "NET_WEIGHT" DECIMAL(10,2), + "GROSS_WEIGHT" DECIMAL(10,2), + "VOLUME" DECIMAL(10,2), + "AREA" DECIMAL(10,2), + "SHIPPER_ID" BIGINT, + "SHIPPER_CODE" VARCHAR(50), + "SHIPPER_NAME" VARCHAR(100), + "PRODUCTION_DATE" DATE, + "EXPIRY_DATE" DATE, + "INVENTORY_DATE" DATE, + "BATCH_REF_NO" VARCHAR(100), + "SHEET_REF_NO" VARCHAR(100), + "BOX_PALLET_NO" VARCHAR(200), + "EXT_ATTR_1" VARCHAR2(255), + "EXT_ATTR_2" VARCHAR2(255), + "EXT_ATTR_3" DATE DEFAULT '', + "EXT_ATTR_4" DATE, + "UNIT_NAME" VARCHAR2(255), + "BAR_CODE" VARCHAR(255), + "IN_ORDER_NUMBER" VARCHAR(100), + "LOT_NUMBER" VARCHAR(100) +) +; +COMMENT ON COLUMN "NGWL_TEST_OMS"."RESERVATION_MATERIAL_INVENTORY"."RESERVATION_MATERIAL_INVENTORY_ID" IS '物料库存id'; +COMMENT ON COLUMN "NGWL_TEST_OMS"."RESERVATION_MATERIAL_INVENTORY"."ORGANIZATION_ID" IS '组织表ID'; +COMMENT ON COLUMN "NGWL_TEST_OMS"."RESERVATION_MATERIAL_INVENTORY"."ORGANIZATION_NAME" IS '组织名称'; +COMMENT ON COLUMN "NGWL_TEST_OMS"."RESERVATION_MATERIAL_INVENTORY"."TOP_ORGANIZATION_ID" IS '一级组织表ID'; +COMMENT ON COLUMN "NGWL_TEST_OMS"."RESERVATION_MATERIAL_INVENTORY"."MATERIAL_BASE_INFO_ID" IS '物料基础信息id'; +COMMENT ON COLUMN "NGWL_TEST_OMS"."RESERVATION_MATERIAL_INVENTORY"."MATERIAL_DETAIL_ID" IS '上架单物料明细id'; +COMMENT ON COLUMN "NGWL_TEST_OMS"."RESERVATION_MATERIAL_INVENTORY"."WAREHOUSE_ID" IS '仓库id'; +COMMENT ON COLUMN "NGWL_TEST_OMS"."RESERVATION_MATERIAL_INVENTORY"."WAREHOUSE_CODE" IS '仓库编码'; +COMMENT ON COLUMN "NGWL_TEST_OMS"."RESERVATION_MATERIAL_INVENTORY"."WAREHOUSE_NAME" IS '仓库名称'; +COMMENT ON COLUMN "NGWL_TEST_OMS"."RESERVATION_MATERIAL_INVENTORY"."STORAGE_SECTION_ID" IS '库区id'; +COMMENT ON COLUMN "NGWL_TEST_OMS"."RESERVATION_MATERIAL_INVENTORY"."STORAGE_CODE" IS '库区编码'; +COMMENT ON COLUMN "NGWL_TEST_OMS"."RESERVATION_MATERIAL_INVENTORY"."STORAGE_NAME" IS '库区名称'; +COMMENT ON COLUMN "NGWL_TEST_OMS"."RESERVATION_MATERIAL_INVENTORY"."STORAGE_LOCATION_ID" IS '库位id'; +COMMENT ON COLUMN "NGWL_TEST_OMS"."RESERVATION_MATERIAL_INVENTORY"."STORAGE_LOCATION_CODE" IS '库位编码'; +COMMENT ON COLUMN "NGWL_TEST_OMS"."RESERVATION_MATERIAL_INVENTORY"."STORAGE_LOCATION_NAME" IS '库位名称'; +COMMENT ON COLUMN "NGWL_TEST_OMS"."RESERVATION_MATERIAL_INVENTORY"."BATCH_NUMBER" IS '批次号'; +COMMENT ON COLUMN "NGWL_TEST_OMS"."RESERVATION_MATERIAL_INVENTORY"."MATERIAL_STATUS_CODE" IS '物料状态编码'; +COMMENT ON COLUMN "NGWL_TEST_OMS"."RESERVATION_MATERIAL_INVENTORY"."MATERIAL_STATUS_NAME" IS '物料状态名称'; +COMMENT ON COLUMN "NGWL_TEST_OMS"."RESERVATION_MATERIAL_INVENTORY"."CONTAINER_ID" IS '容器id'; +COMMENT ON COLUMN "NGWL_TEST_OMS"."RESERVATION_MATERIAL_INVENTORY"."CONTAINER_CODE" IS '容器编码'; +COMMENT ON COLUMN "NGWL_TEST_OMS"."RESERVATION_MATERIAL_INVENTORY"."CONTAINER_TYPE" IS '容器类型 数据字典'; +COMMENT ON COLUMN "NGWL_TEST_OMS"."RESERVATION_MATERIAL_INVENTORY"."CONTAINER_TYPE_NAME" IS '容器类型名称 数据字典'; +COMMENT ON COLUMN "NGWL_TEST_OMS"."RESERVATION_MATERIAL_INVENTORY"."INVENTORY_QUANTITY" IS '库存数量'; +COMMENT ON COLUMN "NGWL_TEST_OMS"."RESERVATION_MATERIAL_INVENTORY"."ALLOCATION_QUANTITY" IS '可用数量'; +COMMENT ON COLUMN "NGWL_TEST_OMS"."RESERVATION_MATERIAL_INVENTORY"."FREEZE_QUANTITY" IS '冻结数量'; +COMMENT ON COLUMN "NGWL_TEST_OMS"."RESERVATION_MATERIAL_INVENTORY"."REMARK" IS '备注'; +COMMENT ON COLUMN "NGWL_TEST_OMS"."RESERVATION_MATERIAL_INVENTORY"."CREATE_TIME" IS '创建时间'; +COMMENT ON COLUMN "NGWL_TEST_OMS"."RESERVATION_MATERIAL_INVENTORY"."CREATE_BY" IS '创建人用户ID'; +COMMENT ON COLUMN "NGWL_TEST_OMS"."RESERVATION_MATERIAL_INVENTORY"."CREATE_BY_NAME" IS '创建人姓名'; +COMMENT ON COLUMN "NGWL_TEST_OMS"."RESERVATION_MATERIAL_INVENTORY"."UPDATE_TIME" IS '最后修改时间'; +COMMENT ON COLUMN "NGWL_TEST_OMS"."RESERVATION_MATERIAL_INVENTORY"."UPDATE_BY" IS '最后修改人用户ID'; +COMMENT ON COLUMN "NGWL_TEST_OMS"."RESERVATION_MATERIAL_INVENTORY"."UPDATE_BY_NAME" IS '修改人姓名'; +COMMENT ON COLUMN "NGWL_TEST_OMS"."RESERVATION_MATERIAL_INVENTORY"."DEL_FLAG" IS '删除标记：0-无状态，1-正常，2-已删除'; +COMMENT ON COLUMN "NGWL_TEST_OMS"."RESERVATION_MATERIAL_INVENTORY"."IS_ABLE" IS '盘点是否可用：0-禁用 1-可用'; +COMMENT ON COLUMN "NGWL_TEST_OMS"."RESERVATION_MATERIAL_INVENTORY"."UNIT" IS '单位'; +COMMENT ON COLUMN "NGWL_TEST_OMS"."RESERVATION_MATERIAL_INVENTORY"."NET_WEIGHT" IS '净重(KG)'; +COMMENT ON COLUMN "NGWL_TEST_OMS"."RESERVATION_MATERIAL_INVENTORY"."GROSS_WEIGHT" IS '毛重(KG)'; +COMMENT ON COLUMN "NGWL_TEST_OMS"."RESERVATION_MATERIAL_INVENTORY"."VOLUME" IS '体积(CBM)'; +COMMENT ON COLUMN "NGWL_TEST_OMS"."RESERVATION_MATERIAL_INVENTORY"."AREA" IS '面积(SQM)'; +COMMENT ON COLUMN "NGWL_TEST_OMS"."RESERVATION_MATERIAL_INVENTORY"."SHIPPER_ID" IS '货主ID'; +COMMENT ON COLUMN "NGWL_TEST_OMS"."RESERVATION_MATERIAL_INVENTORY"."SHIPPER_CODE" IS '货主编码'; +COMMENT ON COLUMN "NGWL_TEST_OMS"."RESERVATION_MATERIAL_INVENTORY"."SHIPPER_NAME" IS '货主名称'; +COMMENT ON COLUMN "NGWL_TEST_OMS"."RESERVATION_MATERIAL_INVENTORY"."PRODUCTION_DATE" IS '生产日期'; +COMMENT ON COLUMN "NGWL_TEST_OMS"."RESERVATION_MATERIAL_INVENTORY"."EXPIRY_DATE" IS '过期日期'; +COMMENT ON COLUMN "NGWL_TEST_OMS"."RESERVATION_MATERIAL_INVENTORY"."INVENTORY_DATE" IS '存货日期'; +COMMENT ON COLUMN "NGWL_TEST_OMS"."RESERVATION_MATERIAL_INVENTORY"."BATCH_REF_NO" IS 'Batch Ref NO''s'; +COMMENT ON COLUMN "NGWL_TEST_OMS"."RESERVATION_MATERIAL_INVENTORY"."SHEET_REF_NO" IS 'Sheet Ref NO''s'; +COMMENT ON COLUMN "NGWL_TEST_OMS"."RESERVATION_MATERIAL_INVENTORY"."BOX_PALLET_NO" IS '箱号/卡板号'; +COMMENT ON COLUMN "NGWL_TEST_OMS"."RESERVATION_MATERIAL_INVENTORY"."EXT_ATTR_1" IS '扩展字段1'; +COMMENT ON COLUMN "NGWL_TEST_OMS"."RESERVATION_MATERIAL_INVENTORY"."EXT_ATTR_2" IS '扩展字段2'; +COMMENT ON COLUMN "NGWL_TEST_OMS"."RESERVATION_MATERIAL_INVENTORY"."EXT_ATTR_3" IS '扩展字段3'; +COMMENT ON COLUMN "NGWL_TEST_OMS"."RESERVATION_MATERIAL_INVENTORY"."EXT_ATTR_4" IS '扩展字段4'; +COMMENT ON COLUMN "NGWL_TEST_OMS"."RESERVATION_MATERIAL_INVENTORY"."UNIT_NAME" IS '单位名'; +COMMENT ON COLUMN "NGWL_TEST_OMS"."RESERVATION_MATERIAL_INVENTORY"."IN_ORDER_NUMBER" IS '入库单号'; +COMMENT ON COLUMN "NGWL_TEST_OMS"."RESERVATION_MATERIAL_INVENTORY"."LOT_NUMBER" IS 'LOT编号'; +COMMENT ON TABLE "NGWL_TEST_OMS"."RESERVATION_MATERIAL_INVENTORY" IS '物料库存表'; + +-- ---------------------------- +-- Primary Key structure for table RESERVATION_MATERIAL_INVENTORY +-- ---------------------------- +ALTER TABLE "NGWL_TEST_OMS"."RESERVATION_MATERIAL_INVENTORY" ADD PRIMARY KEY ("RESERVATION_MATERIAL_INVENTORY_ID"); + +-- ---------------------------- +-- Indexes structure for table RESERVATION_MATERIAL_INVENTORY +-- ---------------------------- +CREATE INDEX "NGWL_TEST_OMS"."IDX_MAT_INV_BASE_ID" + ON "NGWL_TEST_OMS"."RESERVATION_MATERIAL_INVENTORY" ("MATERIAL_BASE_INFO_ID" ASC) + UNUSABLE; +CREATE INDEX "NGWL_TEST_OMS"."IDX_MAT_INV_LOC_MAT_SHIPPER_ID" + ON "NGWL_TEST_OMS"."RESERVATION_MATERIAL_INVENTORY" ("MATERIAL_BASE_INFO_ID" ASC, "SHIPPER_ID" ASC) + UNUSABLE; + + + +/* + Navicat Premium Dump SQL + + Source Server : 113.44.106.61 + Source Server Type : Dameng + Source Server Version : 8014116 (08.01.4116) + Source Host : 113.44.106.61:5236 + Source Schema : NGWL_TEST_OMS + + Target Server Type : Dameng + Target Server Version : 8014116 (08.01.4116) + File Encoding : 65001 + + Date: 22/04/2026 09:00:34 +*/ + + +-- ---------------------------- +-- Table structure for RESERVATION_INVENTORY_ADJUSTMENT_RECORD +-- ---------------------------- +DROP TABLE IF EXISTS "NGWL_TEST_OMS"."RESERVATION_INVENTORY_ADJUSTMENT_RECORD"; +CREATE TABLE "NGWL_TEST_OMS"."RESERVATION_INVENTORY_ADJUSTMENT_RECORD" ( + "INVENTORY_ADJUSTMENT_ID" BIGINT IDENTITY(1,1) NOT NULL, + "ORGANIZATION_ID" BIGINT DEFAULT 0, + "ORGANIZATION_NAME" VARCHAR(100 CHAR) DEFAULT '', + "TOP_ORGANIZATION_ID" BIGINT DEFAULT 0, + "MATERIAL_INVENTORY_ID" BIGINT, + "MATERIAL_BASE_INFO_ID" BIGINT DEFAULT 0, + "MATERIAL_CODE" VARCHAR(32 CHAR) DEFAULT '', + "MATERIAL_NAME" VARCHAR(64 CHAR) DEFAULT '', + "BAR_CODE" VARCHAR(32 CHAR) DEFAULT '', + "SHIPPER_ID" BIGINT DEFAULT 0, + "SHIPPER_NAME" VARCHAR(50 CHAR) DEFAULT '', + "WAREHOUSE_ID" BIGINT DEFAULT 0, + "WAREHOUSE_CODE" VARCHAR(32 CHAR) DEFAULT '', + "WAREHOUSE_NAME" VARCHAR(64 CHAR) DEFAULT '', + "STORAGE_SECTION_ID" BIGINT DEFAULT 0, + "STORAGE_CODE" VARCHAR(32 CHAR) DEFAULT '', + "STORAGE_NAME" VARCHAR(64 CHAR) DEFAULT '', + "STORAGE_LOCATION_ID" BIGINT DEFAULT 0, + "STORAGE_LOCATION_CODE" VARCHAR(32 CHAR) DEFAULT '', + "STORAGE_LOCATION_NAME" VARCHAR(64 CHAR) DEFAULT '', + "ADJUST_TYPE" TINYINT DEFAULT 0, + "ADJUST_DIRECTION" TINYINT DEFAULT 0, + "ADJUST_BEFORE_STATUS_CODE" VARCHAR(32 CHAR) DEFAULT '0', + "ADJUST_BEFORE_STATUS_NAME" VARCHAR(64 CHAR) DEFAULT '', + "ADJUST_AFTER_STATUS_CODE" VARCHAR(32 CHAR) DEFAULT '0', + "ADJUST_AFTER_STATUS_NAME" VARCHAR(64 CHAR) DEFAULT '', + "INVENTORY_BEFORE_QUANTITY" DECIMAL(20,2) DEFAULT 0., + "ALLOCATION_BEFORE_QUANTITY" DECIMAL(20,2), + "FREEZE_BEFORE_QUANTITY" DECIMAL(20,2), + "INVENTORY_AFTER_QUANTITY" DECIMAL(20,2) DEFAULT 0., + "ALLOCATION_AFTER_QUANTITY" DECIMAL(20,2), + "FREEZE_AFTER_QUANTITY" DECIMAL(20,2), + "CREATE_TIME" TIMESTAMP, + "CREATE_BY" BIGINT DEFAULT 0, + "CREATE_BY_NAME" VARCHAR(20 CHAR) DEFAULT '', + "UPDATE_TIME" TIMESTAMP, + "UPDATE_BY" BIGINT DEFAULT 0, + "UPDATE_BY_NAME" VARCHAR(20 CHAR) DEFAULT '', + "DEL_FLAG" TINYINT DEFAULT 1, + "ADJUST_ACTION" VARCHAR2(100), + "RELATE_NO" VARCHAR2(128), + "NET_WEIGHT" DECIMAL(18,3) DEFAULT NULL, + "GROSS_WEIGHT" DECIMAL(18,3) DEFAULT NULL, + "VOLUME" DECIMAL(18,3) DEFAULT NULL, + "AREA" DECIMAL(18,3) DEFAULT NULL, + "ADJUSTED_NET_WEIGHT" DECIMAL(18,3) DEFAULT NULL, + "ADJUSTED_GROSS_WEIGHT" DECIMAL(18,3) DEFAULT NULL, + "ADJUSTED_VOLUME" DECIMAL(18,3) DEFAULT NULL, + "ADJUSTED_AREA" DECIMAL(18,3) DEFAULT NULL, + "IN_ORDER_NUMBER" VARCHAR(100), + "LOT_NUMBER" VARCHAR(100), + "BATCH_NUMBER" VARCHAR(50 CHAR) DEFAULT '' +) +; +COMMENT ON COLUMN "NGWL_TEST_OMS"."RESERVATION_INVENTORY_ADJUSTMENT_RECORD"."INVENTORY_ADJUSTMENT_ID" IS '库存调整记录id'; +COMMENT ON COLUMN "NGWL_TEST_OMS"."RESERVATION_INVENTORY_ADJUSTMENT_RECORD"."ORGANIZATION_ID" IS '组织表ID'; +COMMENT ON COLUMN "NGWL_TEST_OMS"."RESERVATION_INVENTORY_ADJUSTMENT_RECORD"."ORGANIZATION_NAME" IS '组织名称'; +COMMENT ON COLUMN "NGWL_TEST_OMS"."RESERVATION_INVENTORY_ADJUSTMENT_RECORD"."TOP_ORGANIZATION_ID" IS '一级组织表ID'; +COMMENT ON COLUMN "NGWL_TEST_OMS"."RESERVATION_INVENTORY_ADJUSTMENT_RECORD"."MATERIAL_INVENTORY_ID" IS '物料库存id'; +COMMENT ON COLUMN "NGWL_TEST_OMS"."RESERVATION_INVENTORY_ADJUSTMENT_RECORD"."MATERIAL_BASE_INFO_ID" IS '物料基础信息id'; +COMMENT ON COLUMN "NGWL_TEST_OMS"."RESERVATION_INVENTORY_ADJUSTMENT_RECORD"."MATERIAL_CODE" IS '物料编码'; +COMMENT ON COLUMN "NGWL_TEST_OMS"."RESERVATION_INVENTORY_ADJUSTMENT_RECORD"."MATERIAL_NAME" IS '物料名称'; +COMMENT ON COLUMN "NGWL_TEST_OMS"."RESERVATION_INVENTORY_ADJUSTMENT_RECORD"."BAR_CODE" IS '物料条形码'; +COMMENT ON COLUMN "NGWL_TEST_OMS"."RESERVATION_INVENTORY_ADJUSTMENT_RECORD"."SHIPPER_ID" IS '货主id'; +COMMENT ON COLUMN "NGWL_TEST_OMS"."RESERVATION_INVENTORY_ADJUSTMENT_RECORD"."SHIPPER_NAME" IS '货主名称'; +COMMENT ON COLUMN "NGWL_TEST_OMS"."RESERVATION_INVENTORY_ADJUSTMENT_RECORD"."WAREHOUSE_ID" IS '仓库id'; +COMMENT ON COLUMN "NGWL_TEST_OMS"."RESERVATION_INVENTORY_ADJUSTMENT_RECORD"."WAREHOUSE_CODE" IS '仓库编码'; +COMMENT ON COLUMN "NGWL_TEST_OMS"."RESERVATION_INVENTORY_ADJUSTMENT_RECORD"."WAREHOUSE_NAME" IS '仓库名称'; +COMMENT ON COLUMN "NGWL_TEST_OMS"."RESERVATION_INVENTORY_ADJUSTMENT_RECORD"."STORAGE_SECTION_ID" IS '库区id'; +COMMENT ON COLUMN "NGWL_TEST_OMS"."RESERVATION_INVENTORY_ADJUSTMENT_RECORD"."STORAGE_CODE" IS '库区编码'; +COMMENT ON COLUMN "NGWL_TEST_OMS"."RESERVATION_INVENTORY_ADJUSTMENT_RECORD"."STORAGE_NAME" IS '库区名称'; +COMMENT ON COLUMN "NGWL_TEST_OMS"."RESERVATION_INVENTORY_ADJUSTMENT_RECORD"."STORAGE_LOCATION_ID" IS '库位id'; +COMMENT ON COLUMN "NGWL_TEST_OMS"."RESERVATION_INVENTORY_ADJUSTMENT_RECORD"."STORAGE_LOCATION_CODE" IS '库位编码'; +COMMENT ON COLUMN "NGWL_TEST_OMS"."RESERVATION_INVENTORY_ADJUSTMENT_RECORD"."STORAGE_LOCATION_NAME" IS '库位名称'; +COMMENT ON COLUMN "NGWL_TEST_OMS"."RESERVATION_INVENTORY_ADJUSTMENT_RECORD"."ADJUST_TYPE" IS '调整类型：0：无状态 1：数量调整 2：状态调整 3:库存冻结'; +COMMENT ON COLUMN "NGWL_TEST_OMS"."RESERVATION_INVENTORY_ADJUSTMENT_RECORD"."ADJUST_DIRECTION" IS '调整方向：0：无状态 1：增库存 2：减库存'; +COMMENT ON COLUMN "NGWL_TEST_OMS"."RESERVATION_INVENTORY_ADJUSTMENT_RECORD"."ADJUST_BEFORE_STATUS_CODE" IS '调整前状态编码'; +COMMENT ON COLUMN "NGWL_TEST_OMS"."RESERVATION_INVENTORY_ADJUSTMENT_RECORD"."ADJUST_BEFORE_STATUS_NAME" IS '调整前状态名称'; +COMMENT ON COLUMN "NGWL_TEST_OMS"."RESERVATION_INVENTORY_ADJUSTMENT_RECORD"."ADJUST_AFTER_STATUS_CODE" IS '调整后状态编码'; +COMMENT ON COLUMN "NGWL_TEST_OMS"."RESERVATION_INVENTORY_ADJUSTMENT_RECORD"."ADJUST_AFTER_STATUS_NAME" IS '调整后状态名称'; +COMMENT ON COLUMN "NGWL_TEST_OMS"."RESERVATION_INVENTORY_ADJUSTMENT_RECORD"."INVENTORY_BEFORE_QUANTITY" IS '调整前库存数量'; +COMMENT ON COLUMN "NGWL_TEST_OMS"."RESERVATION_INVENTORY_ADJUSTMENT_RECORD"."ALLOCATION_BEFORE_QUANTITY" IS '调整前可用数量'; +COMMENT ON COLUMN "NGWL_TEST_OMS"."RESERVATION_INVENTORY_ADJUSTMENT_RECORD"."FREEZE_BEFORE_QUANTITY" IS '调整前冻结数量'; +COMMENT ON COLUMN "NGWL_TEST_OMS"."RESERVATION_INVENTORY_ADJUSTMENT_RECORD"."INVENTORY_AFTER_QUANTITY" IS '调整后库存数量'; +COMMENT ON COLUMN "NGWL_TEST_OMS"."RESERVATION_INVENTORY_ADJUSTMENT_RECORD"."ALLOCATION_AFTER_QUANTITY" IS '调整后可用数量'; +COMMENT ON COLUMN "NGWL_TEST_OMS"."RESERVATION_INVENTORY_ADJUSTMENT_RECORD"."FREEZE_AFTER_QUANTITY" IS '调整后冻结数量'; +COMMENT ON COLUMN "NGWL_TEST_OMS"."RESERVATION_INVENTORY_ADJUSTMENT_RECORD"."CREATE_TIME" IS '创建时间'; +COMMENT ON COLUMN "NGWL_TEST_OMS"."RESERVATION_INVENTORY_ADJUSTMENT_RECORD"."CREATE_BY" IS '创建人用户ID'; +COMMENT ON COLUMN "NGWL_TEST_OMS"."RESERVATION_INVENTORY_ADJUSTMENT_RECORD"."CREATE_BY_NAME" IS '创建人姓名'; +COMMENT ON COLUMN "NGWL_TEST_OMS"."RESERVATION_INVENTORY_ADJUSTMENT_RECORD"."UPDATE_TIME" IS '最后修改时间'; +COMMENT ON COLUMN "NGWL_TEST_OMS"."RESERVATION_INVENTORY_ADJUSTMENT_RECORD"."UPDATE_BY" IS '最后修改人用户ID'; +COMMENT ON COLUMN "NGWL_TEST_OMS"."RESERVATION_INVENTORY_ADJUSTMENT_RECORD"."UPDATE_BY_NAME" IS '修改人姓名'; +COMMENT ON COLUMN "NGWL_TEST_OMS"."RESERVATION_INVENTORY_ADJUSTMENT_RECORD"."DEL_FLAG" IS '删除标记：0-无状态，1-正常，2-已删除'; +COMMENT ON COLUMN "NGWL_TEST_OMS"."RESERVATION_INVENTORY_ADJUSTMENT_RECORD"."ADJUST_ACTION" IS '调整动作'; +COMMENT ON COLUMN "NGWL_TEST_OMS"."RESERVATION_INVENTORY_ADJUSTMENT_RECORD"."RELATE_NO" IS '关联单号'; +COMMENT ON COLUMN "NGWL_TEST_OMS"."RESERVATION_INVENTORY_ADJUSTMENT_RECORD"."BATCH_NUMBER" IS '批次号'; +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"); \ No newline at end of file diff --git a/sql/wkx20260403.sql b/sql/wkx20260403.sql index 5d3bbb7fe..b7aa37c60 100644 --- a/sql/wkx20260403.sql +++ b/sql/wkx20260403.sql @@ -137,4 +137,4 @@ ALTER TABLE "NGWL_TEST_WMS"."RECEIPT_ORDER_ACCOUNT" ADD PRIMARY KEY ("ID"); ALTER TABLE "NGWL_TEST_SYSTEM"."WAREHOUSE" ADD COLUMN "IS_ENABLE" TINYINT; -COMMENT ON COLUMN "NGWL_TEST_SYSTEM"."WAREHOUSE"."IS_ENABLE" IS '是否启用' \ No newline at end of file +COMMENT ON COLUMN "NGWL_TEST_SYSTEM"."WAREHOUSE"."IS_ENABLE" IS '是否启用'; \ No newline at end of file