Merge branch 'dev' into dev_user0622
# Conflicts: # mhd_wms/src/main/resources/mapper/pickingOrder/PickingOrderMapper.xml
This commit is contained in:
王奎兴
+11
@@ -336,6 +336,17 @@ public class ReviewOrderApplicationService {
|
||||
syncOutOrderCheckQtyByReviewConfirm(reviewOrderId, loginUser);
|
||||
// 与出库单「复核确认」一致：复核数量与拣货数量不一致时生成复核异常单（FHYC）
|
||||
genOutOrderAbnormalAfterReviewConfirm(reviewOrderId);
|
||||
// 校验：复核确认前，已复核数量必须等于计划数量
|
||||
List<ReviewMaterialDetailPO> details = reviewOrderMapper.queryDetailByReviewOrderId(reviewOrderId);
|
||||
if (!CollectionUtils.isEmpty(details)) {
|
||||
for (ReviewMaterialDetailPO detail : details) {
|
||||
BigDecimal reviewed = nz(detail.getReviewedQty());
|
||||
BigDecimal plan = nz(detail.getMaterialPlanQty());
|
||||
if (reviewed.compareTo(plan) != 0) {
|
||||
throw new ServiceException("该物料已复核数量不等于计划数量");
|
||||
}
|
||||
}
|
||||
}
|
||||
ReviewOrder order = reviewOrderMapper.selectById(reviewOrderId);
|
||||
if (order == null) {
|
||||
continue;
|
||||
|
||||
+33
-2
@@ -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<InMaterialDetail> list = inMaterialDetailService.list(new LambdaQueryWrapper<InMaterialDetail>()
|
||||
.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<StockReceiptOrder>()
|
||||
.eq(StockReceiptOrder::getInOrderNumber, stockInOrderPO.getInOrderNumber())
|
||||
.eq(StockReceiptOrder::getDelFlag, 1),false);
|
||||
if (stockReceiptOrder != null) {
|
||||
stockReceiptOrder.setDelFlag(2);
|
||||
stockReceiptOrderService.updateById(stockReceiptOrder);
|
||||
List<ReceiptMaterialDetail> list1 = receiptMaterialDetailService.list(new LambdaQueryWrapper<ReceiptMaterialDetail>()
|
||||
.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);
|
||||
|
||||
+4
@@ -229,4 +229,8 @@ public class MaterialInventoryPO extends MaterialBasePO {
|
||||
@ApiModelProperty("LOT编号")
|
||||
@Excel(name = "LOT编号")
|
||||
private String lotNumber;
|
||||
|
||||
@ApiModelProperty("规格型号")
|
||||
@Excel(name = "规格型号")
|
||||
private String specificationModel;
|
||||
}
|
||||
+9
@@ -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;
|
||||
}
|
||||
+3
@@ -125,6 +125,9 @@ public class PickingOrderPO extends StockOutOrderBasePO {
|
||||
@ApiModelProperty("出库单号")
|
||||
@Excel(name = "出库单号")
|
||||
private String outOrderNumber;
|
||||
@ApiModelProperty("出库单id")
|
||||
@Excel(name = "出库单id")
|
||||
private String outOrderId;
|
||||
|
||||
@ApiModelProperty("业务单号")
|
||||
@Excel(name = "业务单号")
|
||||
|
||||
+3
@@ -405,4 +405,7 @@ public class ShelfMaterialDetailPO extends BaseVOEntity {
|
||||
private BigDecimal erpPriceGw;
|
||||
//申报总价
|
||||
private BigDecimal amountGw;
|
||||
|
||||
@ApiModelProperty("规格型号")
|
||||
private String specificationModel;
|
||||
}
|
||||
+11
-4
@@ -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("申报地关区不能为空; ");
|
||||
|
||||
+6
-1
@@ -34,7 +34,12 @@ public class HeaderListener extends AnalysisEventListener<Map<Integer, Object>>
|
||||
// 将Map转换为List再转为数组
|
||||
List<String> 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、仓库联系人、车型及车牌、委托编码
|
||||
|
||||
+2
@@ -37,6 +37,8 @@ public interface StockOutOrderMapper extends BaseMapper<StockOutOrder> {
|
||||
|
||||
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);
|
||||
|
||||
+9
@@ -194,4 +194,13 @@ public class MaterialInventoryDTO extends MaterialBaseDTO {
|
||||
private String productionDateStr;
|
||||
private String updateTimeStr;
|
||||
|
||||
private String expiryDateStart;
|
||||
private String expiryDateEnd;
|
||||
|
||||
private String productionDateStart;
|
||||
private String productionDateEnd;
|
||||
|
||||
private String updateTimeStart;
|
||||
private String updateTimeEnd;
|
||||
|
||||
}
|
||||
@@ -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
|
||||
</sql>
|
||||
|
||||
|
||||
@@ -64,6 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<result property="barCode" column="inv_bar_code" />
|
||||
<result property="inOrderNumber" column="in_order_number" />
|
||||
<result property="lotNumber" column="lot_number" />
|
||||
<result property="specificationModel" column="specification_model" />
|
||||
</resultMap>
|
||||
|
||||
|
||||
@@ -241,6 +242,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<if test="updateTimeStr != null and updateTimeStr != ''">
|
||||
AND TO_CHAR(a.update_time, 'yyyy-MM-dd') = #{updateTimeStr}
|
||||
</if>
|
||||
|
||||
<if test="updateTimeStart != null and updateTimeStart != ''">
|
||||
and a.update_time >= #{updateTimeStart}
|
||||
</if>
|
||||
<if test="updateTimeEnd != null and updateTimeEnd != ''">
|
||||
and a.update_time <![CDATA[ < ]]> DATEADD(DAY, 1, #{updateTimeEnd})
|
||||
</if>
|
||||
<if test="productionDateStart != null and productionDateStart != ''">
|
||||
and a.production_date >= #{productionDateStart}
|
||||
</if>
|
||||
<if test="productionDateEnd != null and productionDateEnd != ''">
|
||||
and a.production_date <![CDATA[ < ]]> DATEADD(DAY, 1, #{productionDateEnd})
|
||||
</if>
|
||||
<if test="expiryDateStart != null and expiryDateStart != ''">
|
||||
and a.expiry_date >= #{expiryDateStart}
|
||||
</if>
|
||||
<if test="expiryDateEnd != null and expiryDateEnd != ''">
|
||||
and a.expiry_date <![CDATA[ < ]]> DATEADD(DAY, 1, #{expiryDateEnd})
|
||||
</if>
|
||||
</sql>
|
||||
|
||||
<!-- 与 selectMaterialInventoryPo1 相同条件，表别名为 mi（用于 queryListByWl 最新明细子查询） -->
|
||||
|
||||
@@ -38,6 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<result property="pushBy" column="push_by" />
|
||||
<result property="pushByName" column="push_by_name" />
|
||||
<result property="goodsType" column="goods_type" />
|
||||
<result property="outOrderId" column="out_order_id" />
|
||||
</resultMap>
|
||||
|
||||
|
||||
@@ -45,7 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
a.picking_order_id, a.organization_id, a.organization_name, a.top_organization_id, a.order_number, a.picking_order_number,
|
||||
a.status, a.type, a.warehouse_id, a.warehouse_code, a.warehouse_name, a.shipper_id, a.shipper_name, a.quantity, a.weight_limit, a.volume_limit, a.material_quantity,
|
||||
IFNULL((SELECT SUM(b.picking_quantity) FROM picking_material_detail b WHERE b.picking_order_number = a.picking_order_number AND b.del_flag = 1), 0) AS picking_quantity,
|
||||
a.picking_material_quantity, a.abnormal, a.task_distribution, a.remark, a.create_time, a.create_by, a.create_by_name, a.update_time,
|
||||
a.picking_material_quantity, a.abnormal, a.task_distribution, a.remark, a.create_time, a.create_by, a.create_by_name, a.update_time,b.out_order_id,
|
||||
a.update_by, a.update_by_name, a.del_flag,a.out_order_number, a.business_order_no, a.order_type_code, a.order_type_name, a.priority_level_code, a.priority_level_name
|
||||
,a.push_status,a.push_time,a.push_by,a.push_by_name,
|
||||
(SELECT m.goods_type FROM PICKING_MATERIAL_DETAIL d
|
||||
@@ -144,7 +145,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<include refid="selectPickingOrderPo"/>
|
||||
,b.need_Declare_Flag
|
||||
from picking_order a
|
||||
left join STOCK_OUT_ORDER b ON a.order_number = b.out_Order_number and b.del_flag = 1 and a.del_flag = 1
|
||||
left join STOCK_OUT_ORDER b ON a.order_number = b.out_order_number and b.del_flag = 1 and a.del_flag = 1
|
||||
<where>
|
||||
<include refid="selectPickingOrderPo1"/>
|
||||
</where>
|
||||
|
||||
+270
-184
@@ -84,198 +84,284 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<result property="erpCurrGw" column="erp_curr_gw" />
|
||||
<result property="erpPriceGw" column="erp_price_gw" />
|
||||
<result property="amountGw" column="amount_gw" />
|
||||
<result property="specificationModel" column="SPECIFICATION_MODEL" />
|
||||
</resultMap>
|
||||
|
||||
|
||||
<sql id="selectShelfMaterialDetailPo">
|
||||
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
|
||||
</sql>
|
||||
|
||||
<sql id="selectShelfMaterialDetailPo1">
|
||||
<where>
|
||||
<if test="organizationId != null ">
|
||||
and organization_id = #{organizationId}
|
||||
</if>
|
||||
<if test="organizationName != null and organizationName != ''">
|
||||
and organization_name like concat('%', #{organizationName}, '%')
|
||||
</if>
|
||||
<if test="topOrganizationId != null ">
|
||||
and top_organization_id = #{topOrganizationId}
|
||||
</if>
|
||||
<if test="uniqueId != null ">
|
||||
and unique_id = #{uniqueId}
|
||||
</if>
|
||||
<if test="shelfOrderNumber != null and shelfOrderNumber != ''">
|
||||
and shelf_order_number = #{shelfOrderNumber}
|
||||
</if>
|
||||
<if test="materialBaseInfoId != null ">
|
||||
and material_base_info_id = #{materialBaseInfoId}
|
||||
</if>
|
||||
<if test="materialCode != null and materialCode != ''">
|
||||
and material_code = #{materialCode}
|
||||
</if>
|
||||
<if test="materialName != null and materialName != ''">
|
||||
and material_name like concat('%', #{materialName}, '%')
|
||||
</if>
|
||||
<if test="barCode != null and barCode != ''">
|
||||
and bar_code = #{barCode}
|
||||
</if>
|
||||
<if test="quantity != null ">
|
||||
and quantity = #{quantity}
|
||||
</if>
|
||||
<if test="shelvesQuantity != null ">
|
||||
and shelves_quantity = #{shelvesQuantity}
|
||||
</if>
|
||||
<if test="alreadyShelvesQuantity != null ">
|
||||
and already_shelves_quantity = #{alreadyShelvesQuantity}
|
||||
</if>
|
||||
<if test="shelvesStatus != null ">
|
||||
and shelves_status = #{shelvesStatus}
|
||||
</if>
|
||||
<if test="packId != null ">
|
||||
and pack_id = #{packId}
|
||||
</if>
|
||||
<if test="packCode != null and packCode != ''">
|
||||
and pack_code = #{packCode}
|
||||
</if>
|
||||
<if test="packName != null and packName != ''">
|
||||
and pack_name like concat('%', #{packName}, '%')
|
||||
</if>
|
||||
<if test="packDetailId != null and packDetailId != ''">
|
||||
and pack_detail_id = #{packDetailId}
|
||||
</if>
|
||||
<if test="unitCode != null and unitCode != ''">
|
||||
and unit_code = #{unitCode}
|
||||
</if>
|
||||
<if test="unitName != null and unitName != ''">
|
||||
and unit_name like concat('%', #{unitName}, '%')
|
||||
</if>
|
||||
<if test="unitNumber != null ">
|
||||
and unit_number = #{unitNumber}
|
||||
</if>
|
||||
<if test="materialWarehouseControlId != null ">
|
||||
and material_warehouse_control_id = #{materialWarehouseControlId}
|
||||
</if>
|
||||
<if test="serialNumberManage != null ">
|
||||
and serial_number_manage = #{serialNumberManage}
|
||||
</if>
|
||||
<if test="qualityInspectionManage != null ">
|
||||
and quality_inspection_manage = #{qualityInspectionManage}
|
||||
</if>
|
||||
<if test="qualityInspectionStage != null ">
|
||||
and quality_inspection_stage = #{qualityInspectionStage}
|
||||
</if>
|
||||
<if test="qualityInspectionRule != null ">
|
||||
and quality_inspection_rule = #{qualityInspectionRule}
|
||||
</if>
|
||||
<if test="qualityInspectionRatio != null ">
|
||||
and quality_inspection_ratio = #{qualityInspectionRatio}
|
||||
</if>
|
||||
<if test="qualityInspectionTerm != null ">
|
||||
and quality_inspection_term = #{qualityInspectionTerm}
|
||||
</if>
|
||||
<if test="qualityInspectionResults != null ">
|
||||
and quality_inspection_results = #{qualityInspectionResults}
|
||||
</if>
|
||||
<if test="allowOvercharge != null ">
|
||||
and allow_overcharge = #{allowOvercharge}
|
||||
</if>
|
||||
<if test="overchargeRatio != null ">
|
||||
and overcharge_ratio = #{overchargeRatio}
|
||||
</if>
|
||||
<if test="batchNumber != null and batchNumber != ''">
|
||||
and batch_number = #{batchNumber}
|
||||
</if>
|
||||
<if test="lotNumber != null and lotNumber != ''">
|
||||
and lot_number = #{lotNumber}
|
||||
</if>
|
||||
<if test="palletNumber != null and palletNumber != ''">
|
||||
and pallet_number like concat('%', #{palletNumber}, '%')
|
||||
</if>
|
||||
<if test="materialStatusCode != null and materialStatusCode != ''">
|
||||
and material_status_code = #{materialStatusCode}
|
||||
</if>
|
||||
<if test="materialStatusName != null and materialStatusName != ''">
|
||||
and material_status_name like concat('%', #{materialStatusName}, '%')
|
||||
</if>
|
||||
<if test="distributeRuleId != null ">
|
||||
and distribute_rule_id = #{distributeRuleId}
|
||||
</if>
|
||||
<if test="distributeRuleCode != null and distributeRuleCode != ''">
|
||||
and distribute_rule_code = #{distributeRuleCode}
|
||||
</if>
|
||||
<if test="distributeRuleName != null and distributeRuleName != ''">
|
||||
and distribute_rule_name like concat('%', #{distributeRuleName}, '%')
|
||||
</if>
|
||||
<if test="containerId != null ">
|
||||
and container_id = #{containerId}
|
||||
</if>
|
||||
<if test="containerCode != null and containerCode != ''">
|
||||
and container_code = #{containerCode}
|
||||
</if>
|
||||
<if test="containerType != null and containerType != ''">
|
||||
and container_type = #{containerType}
|
||||
</if>
|
||||
<if test="containerTypeName != null and containerTypeName != ''">
|
||||
and container_type_name like concat('%', #{containerTypeName}, '%')
|
||||
</if>
|
||||
<if test="warehouseId != null ">
|
||||
and warehouse_id = #{warehouseId}
|
||||
</if>
|
||||
<if test="warehouseCode != null and warehouseCode != ''">
|
||||
and warehouse_code = #{warehouseCode}
|
||||
</if>
|
||||
<if test="warehouseName != null and warehouseName != ''">
|
||||
and warehouse_name like concat('%', #{warehouseName}, '%')
|
||||
</if>
|
||||
<if test="storageSectionId != null ">
|
||||
and storage_section_id = #{storageSectionId}
|
||||
</if>
|
||||
<if test="storageCode != null and storageCode != ''">
|
||||
and storage_code = #{storageCode}
|
||||
</if>
|
||||
<if test="storageName != null and storageName != ''">
|
||||
and storage_name like concat('%', #{storageName}, '%')
|
||||
</if>
|
||||
<if test="storageLocationId != null ">
|
||||
and storage_location_id = #{storageLocationId}
|
||||
</if>
|
||||
<if test="storageLocationCode != null and storageLocationCode != ''">
|
||||
and storage_location_code = #{storageLocationCode}
|
||||
</if>
|
||||
<if test="storageLocationName != null and storageLocationName != ''">
|
||||
and storage_location_name like concat('%', #{storageLocationName}, '%')
|
||||
</if>
|
||||
<if test="level != null ">
|
||||
and level = #{level}
|
||||
</if>
|
||||
<if test="parentUniqueId != null ">
|
||||
and parent_unique_id = #{parentUniqueId}
|
||||
</if>
|
||||
<if test="createByName != null and createByName != ''">
|
||||
and create_by_name like concat('%', #{createByName}, '%')
|
||||
</if>
|
||||
<if test="updateByName != null and updateByName != ''">
|
||||
and update_by_name like concat('%', #{updateByName}, '%')
|
||||
</if>
|
||||
<choose>
|
||||
<when test="delFlag != null"> and del_flag = #{delFlag} </when>
|
||||
<otherwise> and del_flag = 1 </otherwise>
|
||||
</choose>
|
||||
<if test="organizationId != null ">
|
||||
and a.organization_id = #{organizationId}
|
||||
</if>
|
||||
<if test="organizationName != null and organizationName != ''">
|
||||
and a.organization_name like concat('%', #{organizationName}, '%')
|
||||
</if>
|
||||
<if test="topOrganizationId != null ">
|
||||
and a.top_organization_id = #{topOrganizationId}
|
||||
</if>
|
||||
<if test="uniqueId != null ">
|
||||
and a.unique_id = #{uniqueId}
|
||||
</if>
|
||||
<if test="shelfOrderNumber != null and shelfOrderNumber != ''">
|
||||
and a.shelf_order_number = #{shelfOrderNumber}
|
||||
</if>
|
||||
<if test="materialBaseInfoId != null ">
|
||||
and a.material_base_info_id = #{materialBaseInfoId}
|
||||
</if>
|
||||
<if test="materialCode != null and materialCode != ''">
|
||||
and a.material_code = #{materialCode}
|
||||
</if>
|
||||
<if test="materialName != null and materialName != ''">
|
||||
and a.material_name like concat('%', #{materialName}, '%')
|
||||
</if>
|
||||
<if test="barCode != null and barCode != ''">
|
||||
and a.bar_code = #{barCode}
|
||||
</if>
|
||||
<if test="quantity != null ">
|
||||
and a.quantity = #{quantity}
|
||||
</if>
|
||||
<if test="shelvesQuantity != null ">
|
||||
and a.shelves_quantity = #{shelvesQuantity}
|
||||
</if>
|
||||
<if test="alreadyShelvesQuantity != null ">
|
||||
and a.already_shelves_quantity = #{alreadyShelvesQuantity}
|
||||
</if>
|
||||
<if test="shelvesStatus != null ">
|
||||
and a.shelves_status = #{shelvesStatus}
|
||||
</if>
|
||||
<if test="packId != null ">
|
||||
and a.pack_id = #{packId}
|
||||
</if>
|
||||
<if test="packCode != null and packCode != ''">
|
||||
and a.pack_code = #{packCode}
|
||||
</if>
|
||||
<if test="packName != null and packName != ''">
|
||||
and a.pack_name like concat('%', #{packName}, '%')
|
||||
</if>
|
||||
<if test="packDetailId != null and packDetailId != ''">
|
||||
and a.pack_detail_id = #{packDetailId}
|
||||
</if>
|
||||
<if test="unitCode != null and unitCode != ''">
|
||||
and a.unit_code = #{unitCode}
|
||||
</if>
|
||||
<if test="unitName != null and unitName != ''">
|
||||
and a.unit_name like concat('%', #{unitName}, '%')
|
||||
</if>
|
||||
<if test="unitNumber != null ">
|
||||
and a.unit_number = #{unitNumber}
|
||||
</if>
|
||||
<if test="materialWarehouseControlId != null ">
|
||||
and a.material_warehouse_control_id = #{materialWarehouseControlId}
|
||||
</if>
|
||||
<if test="serialNumberManage != null ">
|
||||
and a.serial_number_manage = #{serialNumberManage}
|
||||
</if>
|
||||
<if test="qualityInspectionManage != null ">
|
||||
and a.quality_inspection_manage = #{qualityInspectionManage}
|
||||
</if>
|
||||
<if test="qualityInspectionStage != null ">
|
||||
and a.quality_inspection_stage = #{qualityInspectionStage}
|
||||
</if>
|
||||
<if test="qualityInspectionRule != null ">
|
||||
and a.quality_inspection_rule = #{qualityInspectionRule}
|
||||
</if>
|
||||
<if test="qualityInspectionRatio != null ">
|
||||
and a.quality_inspection_ratio = #{qualityInspectionRatio}
|
||||
</if>
|
||||
<if test="qualityInspectionTerm != null ">
|
||||
and a.quality_inspection_term = #{qualityInspectionTerm}
|
||||
</if>
|
||||
<if test="qualityInspectionResults != null ">
|
||||
and a.quality_inspection_results = #{qualityInspectionResults}
|
||||
</if>
|
||||
<if test="allowOvercharge != null ">
|
||||
and a.allow_overcharge = #{allowOvercharge}
|
||||
</if>
|
||||
<if test="overchargeRatio != null ">
|
||||
and a.overcharge_ratio = #{overchargeRatio}
|
||||
</if>
|
||||
<if test="batchNumber != null and batchNumber != ''">
|
||||
and a.batch_number = #{batchNumber}
|
||||
</if>
|
||||
<if test="lotNumber != null and lotNumber != ''">
|
||||
and a.lot_number = #{lotNumber}
|
||||
</if>
|
||||
<if test="palletNumber != null and palletNumber != ''">
|
||||
and a.pallet_number like concat('%', #{palletNumber}, '%')
|
||||
</if>
|
||||
<if test="materialStatusCode != null and materialStatusCode != ''">
|
||||
and a.material_status_code = #{materialStatusCode}
|
||||
</if>
|
||||
<if test="materialStatusName != null and materialStatusName != ''">
|
||||
and a.material_status_name like concat('%', #{materialStatusName}, '%')
|
||||
</if>
|
||||
<if test="distributeRuleId != null ">
|
||||
and a.distribute_rule_id = #{distributeRuleId}
|
||||
</if>
|
||||
<if test="distributeRuleCode != null and distributeRuleCode != ''">
|
||||
and a.distribute_rule_code = #{distributeRuleCode}
|
||||
</if>
|
||||
<if test="distributeRuleName != null and distributeRuleName != ''">
|
||||
and a.distribute_rule_name like concat('%', #{distributeRuleName}, '%')
|
||||
</if>
|
||||
<if test="containerId != null ">
|
||||
and a.container_id = #{containerId}
|
||||
</if>
|
||||
<if test="containerCode != null and containerCode != ''">
|
||||
and a.container_code = #{containerCode}
|
||||
</if>
|
||||
<if test="containerType != null and containerType != ''">
|
||||
and a.container_type = #{containerType}
|
||||
</if>
|
||||
<if test="containerTypeName != null and containerTypeName != ''">
|
||||
and a.container_type_name like concat('%', #{containerTypeName}, '%')
|
||||
</if>
|
||||
<if test="warehouseId != null ">
|
||||
and a.warehouse_id = #{warehouseId}
|
||||
</if>
|
||||
<if test="warehouseCode != null and warehouseCode != ''">
|
||||
and a.warehouse_code = #{warehouseCode}
|
||||
</if>
|
||||
<if test="warehouseName != null and warehouseName != ''">
|
||||
and a.warehouse_name like concat('%', #{warehouseName}, '%')
|
||||
</if>
|
||||
<if test="storageSectionId != null ">
|
||||
and a.storage_section_id = #{storageSectionId}
|
||||
</if>
|
||||
<if test="storageCode != null and storageCode != ''">
|
||||
and a.storage_code = #{storageCode}
|
||||
</if>
|
||||
<if test="storageName != null and storageName != ''">
|
||||
and a.storage_name like concat('%', #{storageName}, '%')
|
||||
</if>
|
||||
<if test="storageLocationId != null ">
|
||||
and a.storage_location_id = #{storageLocationId}
|
||||
</if>
|
||||
<if test="storageLocationCode != null and storageLocationCode != ''">
|
||||
and a.storage_location_code = #{storageLocationCode}
|
||||
</if>
|
||||
<if test="storageLocationName != null and storageLocationName != ''">
|
||||
and a.storage_location_name like concat('%', #{storageLocationName}, '%')
|
||||
</if>
|
||||
<if test="level != null ">
|
||||
and a.level = #{level}
|
||||
</if>
|
||||
<if test="parentUniqueId != null ">
|
||||
and a.parent_unique_id = #{parentUniqueId}
|
||||
</if>
|
||||
<if test="createByName != null and createByName != ''">
|
||||
and a.create_by_name like concat('%', #{createByName}, '%')
|
||||
</if>
|
||||
<if test="updateByName != null and updateByName != ''">
|
||||
and a.update_by_name like concat('%', #{updateByName}, '%')
|
||||
</if>
|
||||
<choose>
|
||||
<when test="delFlag != null"> and a.del_flag = #{delFlag} </when>
|
||||
<otherwise> and a.del_flag = 1 </otherwise>
|
||||
</choose>
|
||||
</where>
|
||||
</sql>
|
||||
|
||||
|
||||
@@ -480,6 +480,10 @@
|
||||
<select id="getUserNcCode" parameterType="java.lang.Long" resultType="java.lang.String">
|
||||
select CUSTOMER_NC_CODE from "NGWL_TEST_USER".USER_SHIPPER where 1 = 1 and DEL_FLAG = 1 and USER_ID = #{id} limit 1
|
||||
</select>
|
||||
|
||||
<select id="getSettlementCurrency" parameterType="java.lang.Long" resultType="java.lang.String">
|
||||
select SETTLEMENT_CURRENCY from "NGWL_TEST_USER".USER_SHIPPER where 1 = 1 and DEL_FLAG = 1 and USER_ID = #{id} limit 1
|
||||
</select>
|
||||
<select id="getKcId" parameterType="java.lang.String" resultType="java.lang.Long">
|
||||
select MATERIAL_INVENTORY_ID from "NGWL_TEST_WMS".OUT_MATERIAL_DETAIL where lot_no = #{lotNo}
|
||||
</select>
|
||||
|
||||
Reference in New Issue
Block a user