diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/storageSection/service/StorageSectionDomainService.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/storageSection/service/StorageSectionDomainService.java index 999e08026..dc1df80dc 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/storageSection/service/StorageSectionDomainService.java +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/storageSection/service/StorageSectionDomainService.java @@ -68,6 +68,17 @@ public class StorageSectionDomainService { storageSectionDO.getStorageCode(), storageSectionDO.getStorageName(), null); //设置仓库 setWarehouseInfo(storageSectionDO); + String storageCode = storageSectionDO.getStorageCode(); + String storageName = storageSectionDO.getStorageName(); + Long warehouseId = storageSectionDO.getWarehouseId(); + List list = storageSectionService.list(new QueryWrapper().lambda() + .eq(StorageSection::getStorageCode, storageCode) + .eq(StorageSection::getStorageName, storageName) + .eq(StorageSection::getWarehouseId, warehouseId) + .eq(StorageSection::getDelFlag, 1)); + if (list != null && list.size() > 0) { + throw new ServiceException("库区编码或名称已存在"); + } return storageSectionService.insert(storageSectionDO); } @@ -86,6 +97,17 @@ public class StorageSectionDomainService { storageSectionDO.getStorageSectionId()); //设置仓库 setWarehouseInfo(storageSectionDO); + String storageCode = storageSectionDO.getStorageCode(); + String storageName = storageSectionDO.getStorageName(); + Long warehouseId = storageSectionDO.getWarehouseId(); + List list = storageSectionService.list(new QueryWrapper().lambda() + .eq(StorageSection::getStorageCode, storageCode) + .eq(StorageSection::getStorageName, storageName) + .eq(StorageSection::getWarehouseId, warehouseId) + .eq(StorageSection::getDelFlag, 1)); + if (list != null && list.size() > 0) { + throw new ServiceException("库区编码或名称已存在"); + } return storageSectionService.update(storageSectionDO); } @@ -168,4 +190,4 @@ public class StorageSectionDomainService { } -} +} \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java index f3054e140..6d9b63602 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java @@ -38,6 +38,8 @@ import com.mhd.wms.domain.materialBaseInfo.repository.facade.IMaterialBaseInfoSe import com.mhd.wms.domain.materialBaseInfo.repository.po.MaterialBaseInfoPO; import com.mhd.wms.domain.materialBaseInfo.repository.todo.MaterialBaseInfoDO; import com.mhd.wms.domain.pickingMaterialDetail.repository.mapper.PickingMaterialDetailMapper; +import com.mhd.wms.domain.receiptMaterialDetail.entity.ReceiptMaterialDetail; +import com.mhd.wms.domain.receiptMaterialDetail.repository.facade.IReceiptMaterialDetailService; import com.mhd.wms.domain.receiptOrderAccount.entity.ReceiptOrderAccount; import com.mhd.wms.domain.receiptOrderAccount.repository.facade.IReceiptOrderAccountService; import com.mhd.wms.domain.stockInOrder.entity.StockInOrder; @@ -107,6 +109,8 @@ public class StockInOrderApplicationService { @Autowired private IStockReceiptOrderService stockReceiptOrderService; @Autowired + private IReceiptMaterialDetailService receiptMaterialDetailService; + @Autowired private IStockOutOrderService stockOutOrderService; @Autowired private IHandoverTaskOrderService handoverTaskOrderService; @@ -452,9 +456,36 @@ public class StockInOrderApplicationService { throw new ServiceException("入库单不存在，入库单ID：" + inOrderId); } // 只有已创建状态（status = 1）的入库单可以删除 - if (stockInOrderPO.getStatus() == null || !stockInOrderPO.getStatus().equals(1)) { - throw new ServiceException("只有已创建状态的入库单可以删除，入库单号：" + stockInOrderPO.getInOrderNumber() + "，当前状态：" + getStatusName(stockInOrderPO.getStatus())); +// if (stockInOrderPO.getStatus() == null || !stockInOrderPO.getStatus().equals(1)) { +// throw new ServiceException("只有已创建状态的入库单可以删除，入库单号：" + stockInOrderPO.getInOrderNumber() + "，当前状态：" + getStatusName(stockInOrderPO.getStatus())); +// } + List list = inMaterialDetailService.list(new LambdaQueryWrapper() + .eq(InMaterialDetail::getInOrderNumber, stockInOrderPO.getInOrderNumber()) + .eq(InMaterialDetail::getDelFlag, 1)); + if (list != null && list.size() > 0) { + for (InMaterialDetail inMaterialDetail : list) { + inMaterialDetail.setDelFlag(2); + inMaterialDetailService.updateById(inMaterialDetail); + } } + + StockReceiptOrder stockReceiptOrder = stockReceiptOrderService.getOne(new LambdaQueryWrapper() + .eq(StockReceiptOrder::getInOrderNumber, stockInOrderPO.getInOrderNumber()) + .eq(StockReceiptOrder::getDelFlag, 1),false); + if (stockReceiptOrder != null) { + stockReceiptOrder.setDelFlag(2); + stockReceiptOrderService.updateById(stockReceiptOrder); + List list1 = receiptMaterialDetailService.list(new LambdaQueryWrapper() + .eq(ReceiptMaterialDetail::getReceiptOrderNumber, stockReceiptOrder.getReceiptOrderNumber()) + .eq(ReceiptMaterialDetail::getDelFlag, 1)); + if (list1 != null && list1.size() > 0) { + for (ReceiptMaterialDetail receiptMaterialDetail : list1) { + receiptMaterialDetail.setDelFlag(2); + receiptMaterialDetailService.updateById(receiptMaterialDetail); + } + } + } + } return stockInOrderDomainService.delete(inOrderIds); diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/po/MaterialInventoryPO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/po/MaterialInventoryPO.java index 6cf39f901..dd8fafbb0 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/po/MaterialInventoryPO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/po/MaterialInventoryPO.java @@ -229,4 +229,8 @@ public class MaterialInventoryPO extends MaterialBasePO { @ApiModelProperty("LOT编号") @Excel(name = "LOT编号") private String lotNumber; + + @ApiModelProperty("规格型号") + @Excel(name = "规格型号") + private String specificationModel; } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/todo/MaterialInventoryDO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/todo/MaterialInventoryDO.java index 4b2f8097f..aedd365af 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/todo/MaterialInventoryDO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/todo/MaterialInventoryDO.java @@ -250,4 +250,13 @@ public class MaterialInventoryDO extends MaterialBaseDO { private String expiryDateStr; private String productionDateStr; private String updateTimeStr; + + private String expiryDateStart; + private String expiryDateEnd; + + private String productionDateStart; + private String productionDateEnd; + + private String updateTimeStart; + private String updateTimeEnd; } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/shelfMaterialDetail/repository/po/ShelfMaterialDetailPO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/shelfMaterialDetail/repository/po/ShelfMaterialDetailPO.java index 316595d5a..053cd7ecb 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/shelfMaterialDetail/repository/po/ShelfMaterialDetailPO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/shelfMaterialDetail/repository/po/ShelfMaterialDetailPO.java @@ -405,4 +405,7 @@ public class ShelfMaterialDetailPO extends BaseVOEntity { private BigDecimal erpPriceGw; //申报总价 private BigDecimal amountGw; + + @ApiModelProperty("规格型号") + private String specificationModel; } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/listener/ExcelParseService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/listener/ExcelParseService.java index b93f8b1e0..afaa73354 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/listener/ExcelParseService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/listener/ExcelParseService.java @@ -27,6 +27,7 @@ import com.mhd.wms.domain.materialBaseInfo.repository.todo.MaterialBaseInfoDO; import com.mhd.wms.domain.outMaterialDetail.repository.todo.OutMaterialDetailDO; import com.mhd.wms.domain.stockOutOrder.entity.StockOutOrder; import com.mhd.wms.domain.stockOutOrder.repository.facade.IStockOutOrderService; +import com.mhd.wms.domain.stockOutOrder.repository.mapper.StockOutOrderMapper; import com.mhd.wms.domain.stockOutOrder.repository.todo.StockOutOrderDO; import com.mhd.wms.domain.stockOutOrder.service.StockOutOrderDomainService; import org.springframework.beans.factory.annotation.Autowired; @@ -58,6 +59,8 @@ public class ExcelParseService { private MaterialBaseInfoApplicationService materialBaseInfoService; @Autowired private StockOutOrderDomainService stockOutOrderDomainService; + @Autowired + private StockOutOrderMapper stockOutOrderMapper; @Resource private UserServiceFeign userServiceFeign; /** @@ -111,6 +114,10 @@ public class ExcelParseService { stockOutOrder.setWarehouseName(warehouseName); stockOutOrder.setWarehouseCode(warehouseCode); stockOutOrder.setWarehouseId(warehouseId); + stockOutOrder.setSalesmanId(String.valueOf(loginUser.getUserPo().getUserId())); + stockOutOrder.setSalesmanName(loginUser.getUserPo().getUserName()); + String settlementCurrency = stockOutOrderMapper.getSettlementCurrency(shipperId); + stockOutOrder.setSettlementCurrency(settlementCurrency); initDict(stockOutOrder); if (loginUser != null){ stockOutOrder.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId()); @@ -236,17 +243,17 @@ public class ExcelParseService { errorMsg.append(validateShipperMaterialDetails(stockOutOrder)); if (stockOutOrder.getMaterialDetailList() == null || stockOutOrder.getMaterialDetailList().isEmpty()) errorMsg.append("物料明细列表不能为空或匹配不上物料信息; "); if (StringUtils.isEmpty(stockOutOrder.getTo())) errorMsg.append("To不能为空; "); - if (StringUtils.isEmpty(stockOutOrder.getEntrustNo())) errorMsg.append("委托单号不能为空; "); +// if (StringUtils.isEmpty(stockOutOrder.getEntrustNo())) errorMsg.append("委托单号不能为空; "); if (StringUtils.isEmpty(stockOutOrder.getCarrier())) errorMsg.append("承运商不能为空; "); if (StringUtils.isEmpty(stockOutOrder.getTransportModeCode())) errorMsg.append("运输方式不能为空; "); if (StringUtils.isEmpty(stockOutOrder.getSupervisionModeCode())) errorMsg.append("监督方式不能为空; "); // if (StringUtils.isEmpty(stockOutOrder.getContainerNo())) errorMsg.append("柜号不能为空; "); if (StringUtils.isEmpty(stockOutOrder.getDepartureArrivalCountry())) errorMsg.append("出发/到达国家不能为空; "); - if (StringUtils.isEmpty(stockOutOrder.getManufacturer())) errorMsg.append("制造商不能为空; "); +// if (StringUtils.isEmpty(stockOutOrder.getManufacturer())) errorMsg.append("制造商不能为空; "); // if (ObjectUtil.isEmpty(stockOutOrder.getOutboundDate())) errorMsg.append("出仓日期不能为空; "); if (StringUtils.isEmpty(stockOutOrder.getContactPerson())) errorMsg.append("联系人不能为空; "); - if (StringUtils.isEmpty(stockOutOrder.getTel())) errorMsg.append("Tel不能为空; "); - if (StringUtils.isEmpty(stockOutOrder.getFax())) errorMsg.append("Fax不能为空; "); +// if (StringUtils.isEmpty(stockOutOrder.getTel())) errorMsg.append("Tel不能为空; "); +// if (StringUtils.isEmpty(stockOutOrder.getFax())) errorMsg.append("Fax不能为空; "); if (ObjectUtil.isEmpty(stockOutOrder.getShipperId())) errorMsg.append("客户名称不能为空或匹配不上客户信息; "); //if (StringUtils.isEmpty(stockOutOrder.getNeedDeclareFlag())) errorMsg.append("是否需要申报不能为空; "); if (StringUtils.isEmpty(stockOutOrder.getDeclareCustoms())) errorMsg.append("申报地关区不能为空; "); diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/listener/HeaderListener.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/listener/HeaderListener.java index 010d2e757..3c8f19dba 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/listener/HeaderListener.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/listener/HeaderListener.java @@ -34,7 +34,12 @@ public class HeaderListener extends AnalysisEventListener> // 将Map转换为List再转为数组 List dataList = mapToList(stringData); Object[] rowData = listToArray(dataList); - + String stringValue1 = getStringValue(rowData[0]); + if (stringValue1 != null && !stringValue1.isEmpty()) { + if ("备注：".equals(stringValue1)) { + stockOutOrder.setRemark(getStringValue(rowData[1])); + } + } // 根据行号提取对应信息 switch (rowNum) { case 4: // 第5行：to、仓库联系人、车型及车牌、委托编码 diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/mapper/StockOutOrderMapper.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/mapper/StockOutOrderMapper.java index b907c2a0c..53b9dc775 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/mapper/StockOutOrderMapper.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/mapper/StockOutOrderMapper.java @@ -37,6 +37,8 @@ public interface StockOutOrderMapper extends BaseMapper { public String getUserNcCode(@Param("id") Long id); + public String getSettlementCurrency(@Param("id") Long id); + public Long getKcId(@Param("lotNo") String lotNo); public String getInOrderNumber(@Param("id") Long id); diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/materialInventory/MaterialInventoryDTO.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/materialInventory/MaterialInventoryDTO.java index ef6240425..3e945cdf9 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/materialInventory/MaterialInventoryDTO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/materialInventory/MaterialInventoryDTO.java @@ -191,4 +191,13 @@ public class MaterialInventoryDTO extends MaterialBaseDTO { private String expiryDate; private String productionDate; + private String expiryDateStart; + private String expiryDateEnd; + + private String productionDateStart; + private String productionDateEnd; + + private String updateTimeStart; + private String updateTimeEnd; + } \ No newline at end of file diff --git a/mhd_wms/src/main/resources/mapper/materialBaseInfo/MaterialBaseInfoMapper.xml b/mhd_wms/src/main/resources/mapper/materialBaseInfo/MaterialBaseInfoMapper.xml index 259004ab2..f4fd9e1e4 100644 --- a/mhd_wms/src/main/resources/mapper/materialBaseInfo/MaterialBaseInfoMapper.xml +++ b/mhd_wms/src/main/resources/mapper/materialBaseInfo/MaterialBaseInfoMapper.xml @@ -99,6 +99,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" b.common, b.pack_id, b.pack_code, + b.SPECIFICATION_MODEL, b.pack_name diff --git a/mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml b/mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml index 9fcd08bcf..36b22272d 100644 --- a/mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml +++ b/mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml @@ -64,6 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -241,6 +242,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND TO_CHAR(a.update_time, 'yyyy-MM-dd') = #{updateTimeStr} + + + and a.update_time >= #{updateTimeStart} + + + and a.update_time DATEADD(DAY, 1, #{updateTimeEnd}) + + + and a.production_date >= #{productionDateStart} + + + and a.production_date DATEADD(DAY, 1, #{productionDateEnd}) + + + and a.expiry_date >= #{expiryDateStart} + + + and a.expiry_date DATEADD(DAY, 1, #{expiryDateEnd}) + diff --git a/mhd_wms/src/main/resources/mapper/shelfMaterialDetail/ShelfMaterialDetailMapper.xml b/mhd_wms/src/main/resources/mapper/shelfMaterialDetail/ShelfMaterialDetailMapper.xml index a4c0cdc5d..f192fdeec 100644 --- a/mhd_wms/src/main/resources/mapper/shelfMaterialDetail/ShelfMaterialDetailMapper.xml +++ b/mhd_wms/src/main/resources/mapper/shelfMaterialDetail/ShelfMaterialDetailMapper.xml @@ -84,198 +84,284 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - select material_detail_id, organization_id, organization_name, top_organization_id, unique_id, shelf_order_number, material_base_info_id, material_code, material_name, bar_code, dimensions, quantity, already_shelves_quantity, shelves_quantity, shelves_status, pack_id, pack_code, pack_name, OMS_IN_MATERIAL_DETAIL, - CASE - WHEN pack_detail_id IS NULL OR TRIM(pack_detail_id) = '' THEN NULL - ELSE CAST(pack_detail_id AS BIGINT) - END as pack_detail_id, unit_code, - line_num_gw, - spec_gw, - unit_gw, - qty_gw, - erp_curr_gw, - erp_price_gw, - amount_gw, - in_order_number_gw, - in_line_num_gw, - unit_name, unit_number, material_warehouse_control_id, serial_number_manage, quality_inspection_manage, quality_inspection_stage, quality_inspection_rule, quality_inspection_ratio, quality_inspection_term, quality_inspection_results, allow_overcharge, overcharge_ratio, batch_number, material_status_code, material_status_name, distribute_rule_id, distribute_rule_code, distribute_rule_name, container_id, container_code, container_type, container_type_name, warehouse_id, warehouse_code, warehouse_name, storage_section_id, storage_code, storage_name, storage_location_id, storage_location_code, storage_location_name, level, parent_unique_id, in_unique_id, receipt_unique_id, allow_modify, remark, batch_ref_no, sheet_ref_no, box_pallet_no, ext_attr_1, ext_attr_2, production_date, expiry_date, inventory_date, ext_attr_3, ext_attr_4, create_time, create_by, create_by_name, update_time, update_by, update_by_name, del_flag,total_net_weight,total_gross_weight,total_volume,total_area,in_order_number,lot_number,pallet_number,copy_batch,copy_quantity,copy_details from shelf_material_detail + select a.material_detail_id, + a.organization_id, + a.organization_name, + a.top_organization_id, + a.unique_id, + a.shelf_order_number, + a.material_base_info_id, + a.material_code, + a.material_name, + a.bar_code, + a.dimensions, + a.quantity, + a.already_shelves_quantity, + a.shelves_quantity, + a.shelves_status, + a.pack_id, + a.pack_code, + a.pack_name, + a.OMS_IN_MATERIAL_DETAIL, + CASE + WHEN a.pack_detail_id IS NULL OR TRIM(a.pack_detail_id) = '' THEN NULL + ELSE CAST(a.pack_detail_id AS BIGINT) + END as pack_detail_id, + a.unit_code, + a.line_num_gw, + a.spec_gw, + a.unit_gw, + a.qty_gw, + a.erp_curr_gw, + a.erp_price_gw, + a.amount_gw, + a.in_order_number_gw, + a.in_line_num_gw, + a.unit_name, + a.unit_number, + a.material_warehouse_control_id, + a.serial_number_manage, + a.quality_inspection_manage, + a.quality_inspection_stage, + a.quality_inspection_rule, + a.quality_inspection_ratio, + a.quality_inspection_term, + a.quality_inspection_results, + a.allow_overcharge, + a.overcharge_ratio, + a.batch_number, + a.material_status_code, + a.material_status_name, + a.distribute_rule_id, + a.distribute_rule_code, + a.distribute_rule_name, + a.container_id, + a.container_code, + a.container_type, + a.container_type_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.level, + a.parent_unique_id, + a.in_unique_id, + a.receipt_unique_id, + a.allow_modify, + a.remark, + a.batch_ref_no, + a.sheet_ref_no, + a.box_pallet_no, + a.ext_attr_1, + a.ext_attr_2, + a.production_date, + a.expiry_date, + a.inventory_date, + a.ext_attr_3, + a.ext_attr_4, + a.create_time, + a.create_by, + a.create_by_name, + a.update_time, + a.update_by, + a.update_by_name, + a.del_flag, + a.total_net_weight, + a.total_gross_weight, + a.total_volume, + a.total_area, + a.in_order_number, + a.lot_number, + a.pallet_number, + a.copy_batch, + a.copy_quantity, + a.copy_details, + c.SPECIFICATION_MODEL + from shelf_material_detail a + LEFT JOIN MATERIAL_BASE_INFO c ON a.MATERIAL_BASE_INFO_ID = c.MATERIAL_BASE_INFO_ID AND c.DEL_FLAG = 1 - - and organization_id = #{organizationId} - - - and organization_name like concat('%', #{organizationName}, '%') - - - and top_organization_id = #{topOrganizationId} - - - and unique_id = #{uniqueId} - - - and shelf_order_number = #{shelfOrderNumber} - - - and material_base_info_id = #{materialBaseInfoId} - - - and material_code = #{materialCode} - - - and material_name like concat('%', #{materialName}, '%') - - - and bar_code = #{barCode} - - - and quantity = #{quantity} - - - and shelves_quantity = #{shelvesQuantity} - - - and already_shelves_quantity = #{alreadyShelvesQuantity} - - - and shelves_status = #{shelvesStatus} - - - and pack_id = #{packId} - - - and pack_code = #{packCode} - - - and pack_name like concat('%', #{packName}, '%') - - - and pack_detail_id = #{packDetailId} - - - and unit_code = #{unitCode} - - - and unit_name like concat('%', #{unitName}, '%') - - - and unit_number = #{unitNumber} - - - and material_warehouse_control_id = #{materialWarehouseControlId} - - - and serial_number_manage = #{serialNumberManage} - - - and quality_inspection_manage = #{qualityInspectionManage} - - - and quality_inspection_stage = #{qualityInspectionStage} - - - and quality_inspection_rule = #{qualityInspectionRule} - - - and quality_inspection_ratio = #{qualityInspectionRatio} - - - and quality_inspection_term = #{qualityInspectionTerm} - - - and quality_inspection_results = #{qualityInspectionResults} - - - and allow_overcharge = #{allowOvercharge} - - - and overcharge_ratio = #{overchargeRatio} - - - and batch_number = #{batchNumber} - - - and lot_number = #{lotNumber} - - - and pallet_number like concat('%', #{palletNumber}, '%') - - - and material_status_code = #{materialStatusCode} - - - and material_status_name like concat('%', #{materialStatusName}, '%') - - - and distribute_rule_id = #{distributeRuleId} - - - and distribute_rule_code = #{distributeRuleCode} - - - and distribute_rule_name like concat('%', #{distributeRuleName}, '%') - - - and container_id = #{containerId} - - - and container_code = #{containerCode} - - - and container_type = #{containerType} - - - and container_type_name like concat('%', #{containerTypeName}, '%') - - - and warehouse_id = #{warehouseId} - - - and warehouse_code = #{warehouseCode} - - - and warehouse_name like concat('%', #{warehouseName}, '%') - - - and storage_section_id = #{storageSectionId} - - - and storage_code = #{storageCode} - - - and storage_name like concat('%', #{storageName}, '%') - - - and storage_location_id = #{storageLocationId} - - - and storage_location_code = #{storageLocationCode} - - - and storage_location_name like concat('%', #{storageLocationName}, '%') - - - and level = #{level} - - - and parent_unique_id = #{parentUniqueId} - - - and create_by_name like concat('%', #{createByName}, '%') - - - and update_by_name like concat('%', #{updateByName}, '%') - - - and del_flag = #{delFlag} - and del_flag = 1 - + + and a.organization_id = #{organizationId} + + + and a.organization_name like concat('%', #{organizationName}, '%') + + + and a.top_organization_id = #{topOrganizationId} + + + and a.unique_id = #{uniqueId} + + + and a.shelf_order_number = #{shelfOrderNumber} + + + and a.material_base_info_id = #{materialBaseInfoId} + + + and a.material_code = #{materialCode} + + + and a.material_name like concat('%', #{materialName}, '%') + + + and a.bar_code = #{barCode} + + + and a.quantity = #{quantity} + + + and a.shelves_quantity = #{shelvesQuantity} + + + and a.already_shelves_quantity = #{alreadyShelvesQuantity} + + + and a.shelves_status = #{shelvesStatus} + + + and a.pack_id = #{packId} + + + and a.pack_code = #{packCode} + + + and a.pack_name like concat('%', #{packName}, '%') + + + and a.pack_detail_id = #{packDetailId} + + + and a.unit_code = #{unitCode} + + + and a.unit_name like concat('%', #{unitName}, '%') + + + and a.unit_number = #{unitNumber} + + + and a.material_warehouse_control_id = #{materialWarehouseControlId} + + + and a.serial_number_manage = #{serialNumberManage} + + + and a.quality_inspection_manage = #{qualityInspectionManage} + + + and a.quality_inspection_stage = #{qualityInspectionStage} + + + and a.quality_inspection_rule = #{qualityInspectionRule} + + + and a.quality_inspection_ratio = #{qualityInspectionRatio} + + + and a.quality_inspection_term = #{qualityInspectionTerm} + + + and a.quality_inspection_results = #{qualityInspectionResults} + + + and a.allow_overcharge = #{allowOvercharge} + + + and a.overcharge_ratio = #{overchargeRatio} + + + and a.batch_number = #{batchNumber} + + + and a.lot_number = #{lotNumber} + + + and a.pallet_number like concat('%', #{palletNumber}, '%') + + + and a.material_status_code = #{materialStatusCode} + + + and a.material_status_name like concat('%', #{materialStatusName}, '%') + + + and a.distribute_rule_id = #{distributeRuleId} + + + and a.distribute_rule_code = #{distributeRuleCode} + + + and a.distribute_rule_name like concat('%', #{distributeRuleName}, '%') + + + and a.container_id = #{containerId} + + + and a.container_code = #{containerCode} + + + and a.container_type = #{containerType} + + + and a.container_type_name like concat('%', #{containerTypeName}, '%') + + + 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.level = #{level} + + + and a.parent_unique_id = #{parentUniqueId} + + + 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 + diff --git a/mhd_wms/src/main/resources/mapper/stockOutOrder/StockOutOrderMapper.xml b/mhd_wms/src/main/resources/mapper/stockOutOrder/StockOutOrderMapper.xml index c090be1c8..87b8b297b 100644 --- a/mhd_wms/src/main/resources/mapper/stockOutOrder/StockOutOrderMapper.xml +++ b/mhd_wms/src/main/resources/mapper/stockOutOrder/StockOutOrderMapper.xml @@ -480,6 +480,10 @@ + +