root/yinnihailiang_one
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 出库明细、分配明细

Browse Source
This commit is contained in:
liyongde
2025-06-11 17:00:27 +08:00
parent 1d090f3575
commit 619a6de84f
17 changed files with 616 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/IStIvtIostorinvdisService.java
View File

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import org.nl.b_lms.storage_manage.ios.service.iostorInv.dao.StIvtIostorinvdis;
import org.nl.common.domain.query.PageQuery;
import org.nl.wms.st.outbill.service.dto.OutBillTaskParam;
import org.nl.wms.st.outbill.service.vo.OutBillTaskVo;
import org.nl.wms.stat.service.dto.InBillPageParam;
import org.nl.wms.stat.service.dto.OutBillPageParam;
import org.nl.wms.stat.service.vo.InBillPageVo;
@@ -85,5 +87,12 @@ public interface IStIvtIostorinvdisService extends IService<StIvtIostorinvdis> {
* @return
*/
List<StIvtIostorinvdis> getAllocationByIosId(String iosId);
/**
* 详情查询出库单分配任务2
* @param param
* @return
*/
List<OutBillTaskVo> getOutBillTask2(OutBillTaskParam param);
}

8
lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/IStIvtIostorinvdtlService.java
View File

@@ -3,6 +3,8 @@ package org.nl.b_lms.storage_manage.ios.service.iostorInv;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.extension.service.IService;
import org.nl.b_lms.storage_manage.ios.service.iostorInv.dao.StIvtIostorinvdtl;
import org.nl.wms.st.outbill.service.dto.OutBillDtlQueryParam;
import org.nl.wms.st.outbill.service.vo.OutBillDtlVo;
import java.util.ArrayList;
import java.util.HashMap;
@@ -76,4 +78,10 @@ public interface IStIvtIostorinvdtlService extends IService<StIvtIostorinvdtl> {
*/
void updateStatus(String iostorinvdtl_id);
/**
* 查询出库明细
* @param param
* @return
*/
List<OutBillDtlVo> getOutBillDtl(OutBillDtlQueryParam param);
}

4
lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/dao/mapper/StIvtIostorinvdisMapper.java
View File

@@ -8,6 +8,8 @@ import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import org.nl.b_lms.storage_manage.ios.service.iostorInv.dao.StIvtIostorinvdis;
import org.nl.wms.st.outbill.service.dto.OutBillTaskParam;
import org.nl.wms.st.outbill.service.vo.OutBillTaskVo;
import org.nl.wms.stat.service.dto.InBillPageParam;
import org.nl.wms.stat.service.dto.OutBillPageParam;
import org.nl.wms.stat.service.vo.InBillPageVo;
@@ -89,4 +91,6 @@ public interface StIvtIostorinvdisMapper extends BaseMapper<StIvtIostorinvdis> {
IPage<OutBillPageVo> selectOutBillPageLeftJoin(IPage<OutBillPageVo> pages, OutBillPageParam paramMap);
List<OutBillPageVo> getOutBillData(@Param("paramMap") OutBillPageParam paramMap);
List<OutBillTaskVo> getOutBillTask2(@Param("param") OutBillTaskParam param);
}

36
lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/dao/mapper/StIvtIostorinvdisMapper.xml
View File

@@ -1063,6 +1063,42 @@
WHERE 1=1
limit 0,50000
</select>
<select id="getOutBillTask2" resultType="org.nl.wms.st.outbill.service.vo.OutBillTaskVo">
SELECT
dis.*,
mater.material_code,
mater.material_name,
point.point_code AS next_point_code,
task.task_code,
task.task_type,
task.task_status,
(case when IFNULL(record.sap_pcsn,'') = '' then sub.sap_pcsn else record.sap_pcsn end) AS sap_pcsn,
(case when IFNULL(record.width_standard,'') = '' then sub.width_standard else record.width_standard end) AS width_standard,
md.class_name task_type_name
FROM
st_ivt_iostorinvdis dis
LEFT JOIN md_me_materialbase mater ON dis.material_id = mater.material_id
LEFT JOIN sch_base_point point ON dis.point_id = point.point_id
LEFT JOIN ST_IVT_IOStorInv ios ON ios.iostorinv_id = dis.iostorinv_id
LEFT JOIN sch_base_task task ON dis.task_id = task.task_id
LEFT JOIN pdm_bi_subpackagerelation sub ON dis.pcsn = sub.container_name AND sub.package_box_sn = dis.box_no
LEFT JOIN pdm_bi_subpackagerelationrecord record ON record.container_name = dis.pcsn AND ios.bill_code = record.bill_code
LEFT JOIN md_pb_classstandard md ON task.task_type = md.class_code
WHERE
1=1
<if test="param.iostorinv_id != null and param.iostorinv_id != ''">
AND dis.iostorinv_id = #{param.iostorinv_id}
</if>
<if test="param.iostorinvdtl_id != null and param.iostorinvdtl_id != ''">
AND dis.iostorinvdtl_id = #{param.iostorinvdtl_id}
</if>
<if test="param.is_issued != null and param.is_issued != ''">
AND dis.is_issued = #{param.is_issued}
</if>
<if test="param.struct_id != null and param.struct_id != ''">
AND dis.struct_id #{param.struct_id}
</if>
</select>
</mapper>

6
lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/dao/mapper/StIvtIostorinvdtlMapper.java
View File

@@ -4,6 +4,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import com.alibaba.fastjson.JSONArray;
import org.nl.b_lms.storage_manage.ios.service.iostorInv.dao.StIvtIostorinvdtl;
import org.nl.wms.st.outbill.service.dto.OutBillDtlQueryParam;
import org.nl.wms.st.outbill.service.vo.OutBillDtlVo;
import java.util.List;
/**
* <p>
@@ -16,4 +20,6 @@ import org.nl.b_lms.storage_manage.ios.service.iostorInv.dao.StIvtIostorinvdtl;
public interface StIvtIostorinvdtlMapper extends BaseMapper<StIvtIostorinvdtl> {
JSONArray selectIoDtl(@Param("billCode") String id, @Param("openFlag") String openFlag);
List<OutBillDtlVo> getOutBillDtl(@Param("param") OutBillDtlQueryParam param);
}

72
lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/dao/mapper/StIvtIostorinvdtlMapper.xml
View File

@@ -29,4 +29,76 @@
dtl.box_no,
dtl.pcsn
</select>
<select id="getOutBillDtl" resultType="org.nl.wms.st.outbill.service.vo.OutBillDtlVo">
SELECT
iosdtl.iostorinvdtl_id,
iosdtl.iostorinv_id,
iosdtl.seq_no,
iosdtl.material_id,
iosdtl.pcsn,
iosdtl.quality_scode,
iosdtl.bill_status,
iosdtl.qty_unit_id,
iosdtl.qty_unit_name,
iosdtl.plan_qty,
iosdtl.real_qty,
iosdtl.source_billdtl_id,
iosdtl.source_bill_type,
iosdtl.source_bill_code,
iosdtl.source_bill_table,
iosdtl.base_billdtl_id,
iosdtl.base_bill_type,
iosdtl.base_bill_code,
iosdtl.base_bill_table,
iosdtl.remark,
iosdtl.assign_qty,
iosdtl.unassign_qty,
iosdtl.box_no,
iosdtl.vbeln,
iosdtl.posnr,
iosdtl.width,
ios.bill_code,
mb.material_code,
mb.material_name,
mb.material_spec,
mb.material_model,
(case when IFNULL(record2.sap_pcsn,'') = '' then sub.sap_pcsn else record2.sap_pcsn end) AS sap_pcsn
FROM
ST_IVT_IOStorInvDtl iosdtl
LEFT JOIN md_me_materialbase mb ON mb.material_id = iosdtl.material_id
LEFT JOIN ST_IVT_IOStorInv ios ON ios.iostorinv_id = iosdtl.iostorinv_id
LEFT JOIN pdm_bi_subpackagerelation sub ON sub.container_name = iosdtl.pcsn AND sub.package_box_sn =
iosdtl.box_no
LEFT JOIN (
SELECT
record.bill_code,
record.container_name,
record.package_box_sn,
record.sap_pcsn,
COUNT( * ) AS num
FROM
pdm_bi_subpackagerelationrecord record
GROUP BY
record.bill_code,
record.container_name,
record.sap_pcsn,
record.package_box_sn
) record2 ON (record2.container_name = iosdtl.pcsn AND ios.bill_code = record2.bill_code AND
record2.package_box_sn = iosdtl.box_no)
WHERE
1=1
<if test="param.iostorinv_id != null and param.iostorinv_id != ''">
AND iosdtl.iostorinv_id = #{param.iostorinv_id}
</if>
<if test="param.iostorinvdtl_id != null and param.iostorinvdtl_id != ''">
AND iosdtl.iostorinvdtl_id = #{param.iostorinvdtl_id}
</if>
<if test="param.bill_status != null and param.bill_status != ''">
AND iosdtl.iostorinvdtl_id <![CDATA[ <= ]]> #{param.bill_status}
</if>
<if test="param.unassign_flag != null and param.unassign_flag != ''">
AND iosdtl.unassign_qty <![CDATA[ > ]]> 0
</if>
order by iosdtl.box_no,iosdtl.pcsn
</select>
</mapper>

20
lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvdisServiceImpl.java
View File

@@ -21,6 +21,8 @@ import org.nl.b_lms.storage_manage.ios.service.iostorInv.dao.mapper.StIvtIostori
import org.nl.common.domain.query.PageQuery;
import org.nl.common.utils.IdUtil;
import org.nl.modules.wql.util.SpringContextHolder;
import org.nl.wms.st.outbill.service.dto.OutBillTaskParam;
import org.nl.wms.st.outbill.service.vo.OutBillTaskVo;
import org.nl.wms.stat.service.dto.InBillPageParam;
import org.nl.wms.stat.service.dto.OutBillPageParam;
import org.nl.wms.stat.service.vo.InBillPageVo;
@@ -295,4 +297,22 @@ public class StIvtIostorinvdisServiceImpl extends ServiceImpl<StIvtIostorinvdisM
lam.eq(StIvtIostorinvdis::getIostorinv_id, iosId);
return list(lam);
}
@Override
public List<OutBillTaskVo> getOutBillTask2(OutBillTaskParam param) {
List<OutBillTaskVo> outBillTask2 = stIvtIostorinvdisMapper.getOutBillTask2(param);
outBillTask2.forEach(bill -> {
String taskStatus = bill.getTask_status();
if (ObjectUtil.isEmpty(taskStatus)) {
String workStatus = bill.getWork_status();
if ("01".equals(workStatus)) {
bill.setTask_status("01");
}
if ("99".equals(workStatus)) {
bill.setTask_status("07");
}
}
});
return outBillTask2;
}
}

9
lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvdtlServiceImpl.java
View File

@@ -17,6 +17,8 @@ import org.nl.b_lms.storage_manage.ios.service.iostorInv.dao.mapper.StIvtIostori
import org.nl.common.utils.IdUtil;
import org.nl.modules.common.exception.BadRequestException;
import org.nl.modules.wql.core.bean.WQLObject;
import org.nl.wms.st.outbill.service.dto.OutBillDtlQueryParam;
import org.nl.wms.st.outbill.service.vo.OutBillDtlVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -48,6 +50,8 @@ public class StIvtIostorinvdtlServiceImpl extends ServiceImpl<StIvtIostorinvdtlM
*/
@Autowired
private IStIvtIostorinvService iStIvtIostorinvService;
@Autowired
private StIvtIostorinvdtlMapper stIvtIostorinvdtlMapper;
@Override
public HashMap<String, ArrayList<JSONObject>>insertDtl(List<JSONObject> rows, String iostorinv_id) {
@@ -316,6 +320,11 @@ public class StIvtIostorinvdtlServiceImpl extends ServiceImpl<StIvtIostorinvdtlM
}
}
@Override
public List<OutBillDtlVo> getOutBillDtl(OutBillDtlQueryParam param) {
return stIvtIostorinvdtlMapper.getOutBillDtl(param);
}
/**
* 组织分配明细所需数据
* @param dtlDao： 明细实体类

4
lms/nladmin-system/src/main/java/org/nl/wms/st/instor/rest/CheckController.java
View File

@@ -14,9 +14,11 @@ import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.Map;
/**
* 盘点功能
*/
@RestController
@RequiredArgsConstructor
@RequestMapping("/api/check")
@Slf4j
public class CheckController {

35
lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/rest/CheckOutBillController.java Normal file
View File

@@ -0,0 +1,35 @@
package org.nl.wms.st.outbill.rest;
import lombok.extern.slf4j.Slf4j;
import org.nl.modules.logging.annotation.Log;
import org.nl.wms.st.outbill.service.CheckOutBillService;
import org.nl.wms.st.outbill.service.dto.OutBillDtlQueryParam;
import org.nl.wms.st.outbill.service.dto.OutBillTaskParam;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.Map;
/**
* @Author: lyd
* @Date: 2025/6/11
*/
@RestController
@RequestMapping("/api/checkoutbill")
@Slf4j
public class CheckOutBillController {
@Resource
private CheckOutBillService checkOutBillService;
@GetMapping("/getOutBillDtl")
@Log("查询出库明细")
public ResponseEntity<Object> getOutBillDtl(OutBillDtlQueryParam param) {
return new ResponseEntity<>(checkOutBillService.getOutBillDtl(param), HttpStatus.OK);
}
@PostMapping("/getOutBillTask2")
@Log("详情查询出库单分配任务2")
public ResponseEntity<Object> getOutBillTask2(@RequestBody OutBillTaskParam param) {
return new ResponseEntity<>(checkOutBillService.getOutBillTask2(param), HttpStatus.OK);
}
}

28
lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/CheckOutBillService.java Normal file
View File

@@ -0,0 +1,28 @@
package org.nl.wms.st.outbill.service;
import org.nl.wms.st.outbill.service.dto.OutBillDtlQueryParam;
import org.nl.wms.st.outbill.service.dto.OutBillTaskParam;
import org.nl.wms.st.outbill.service.vo.OutBillDtlVo;
import org.nl.wms.st.outbill.service.vo.OutBillTaskVo;
import java.util.List;
/**
* @Author: lyd
* @Date: 2025/6/11
*/
public interface CheckOutBillService {
/**
* 查询出库明细
* @param param
* @return
*/
List<OutBillDtlVo> getOutBillDtl(OutBillDtlQueryParam param);
/**
* 详情查询出库单分配任务2
* @param param
* @return
*/
List<OutBillTaskVo> getOutBillTask2(OutBillTaskParam param);
}

19
lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/dto/OutBillDtlQueryParam.java Normal file
View File

@@ -0,0 +1,19 @@
package org.nl.wms.st.outbill.service.dto;
import lombok.Data;
import java.io.Serializable;
/**
* 出库单明细查询参数类
* @Author: lyd
* @Date: 2025/6/11
*/
@Data
public class OutBillDtlQueryParam implements Serializable {
private String iostorinv_id;
private String iostorinvdtl_id;
private String bill_status;
private String unassign_flag;
}

18
lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/dto/OutBillTaskParam.java Normal file
View File

@@ -0,0 +1,18 @@
package org.nl.wms.st.outbill.service.dto;
import lombok.Data;
import java.io.Serializable;
/**
* 出库单任务查询参数
* @Author: lyd
* @Date: 2025/6/11
*/
@Data
public class OutBillTaskParam implements Serializable {
private String iostorinvdtl_id;
private String iostorinv_id;
private String is_issued;
private String struct_id;
}

36
lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java Normal file
View File

@@ -0,0 +1,36 @@
package org.nl.wms.st.outbill.service.impl;
import lombok.extern.slf4j.Slf4j;
import org.nl.b_lms.storage_manage.ios.service.iostorInv.IStIvtIostorinvdisService;
import org.nl.b_lms.storage_manage.ios.service.iostorInv.IStIvtIostorinvdtlService;
import org.nl.wms.st.outbill.service.CheckOutBillService;
import org.nl.wms.st.outbill.service.dto.OutBillDtlQueryParam;
import org.nl.wms.st.outbill.service.dto.OutBillTaskParam;
import org.nl.wms.st.outbill.service.vo.OutBillDtlVo;
import org.nl.wms.st.outbill.service.vo.OutBillTaskVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* @Author: lyd
* @Date: 2025/6/11
*/
@Service
@Slf4j
public class CheckOutBillServiceImpl implements CheckOutBillService {
@Autowired
private IStIvtIostorinvdtlService iostorinvdtlService;
@Autowired
private IStIvtIostorinvdisService iostorinvdisService;
@Override
public List<OutBillDtlVo> getOutBillDtl(OutBillDtlQueryParam param) {
return iostorinvdtlService.getOutBillDtl(param);
}
@Override
public List<OutBillTaskVo> getOutBillTask2(OutBillTaskParam param) {
return iostorinvdisService.getOutBillTask2(param);
}
}

150
lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/vo/OutBillDtlVo.java Normal file
View File

@@ -0,0 +1,150 @@
package org.nl.wms.st.outbill.service.vo;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
/**
* 出库单明细vo实体
* @Author: lyd
* @Date: 2025/6/11
*/
@Data
public class OutBillDtlVo implements Serializable {
/**
* 出入单明细标识
*/
private String iostorinvdtl_id;
/**
* 出入单标识
*/
private String iostorinv_id;
/**
* 明细序号
*/
private BigDecimal seq_no;
/**
* 物料标识
*/
private Long material_id;
/**
* 批次
*/
private String pcsn;
/**
* 品质类型
*/
private String quality_scode;
/**
* 单据明细状态
*/
private String bill_status;
/**
* 数量计量单位标识
*/
private Long qty_unit_id;
/**
* 数量计量单位名称
*/
private String qty_unit_name;
/**
* 计划数量
*/
private BigDecimal plan_qty;
/**
* 实际数量
*/
private BigDecimal real_qty;
/**
* 来源单据明细标识
*/
private Long source_billdtl_id;
/**
* 来源单据类型
*/
private String source_bill_type;
/**
* 来源单编号
*/
private String source_bill_code;
/**
* 来源单表名
*/
private String source_bill_table;
/**
* 基础单据明细标识
*/
private Long base_billdtl_id;
/**
* 基础单据类型
*/
private String base_bill_type;
/**
* 基础单编号
*/
private String base_bill_code;
/**
* 基础单表名
*/
private String base_bill_table;
/**
* 备注
*/
private String remark;
/**
* 已分配数量
*/
private BigDecimal assign_qty;
/**
* 未分配数量
*/
private BigDecimal unassign_qty;
/**
* 箱号
*/
private String box_no;
/**
* 来源交货单
*/
private String vbeln;
/**
* 来源交货单行
*/
private String posnr;
/**
* 发货幅宽
*/
private String width;
private String bill_code;
private String material_code;
private String material_name;
private String material_spec;
private String material_model;
private String sap_pcsn;
}

155
lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/vo/OutBillTaskVo.java Normal file
View File

@@ -0,0 +1,155 @@
package org.nl.wms.st.outbill.service.vo;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
/**
* 出库单任务vo
* @Author: lyd
* @Date: 2025/6/11
*/
@Data
public class OutBillTaskVo implements Serializable {
/**
* 出入单分配标识
*/
private String iostorinvdis_id;
/**
* 出入单标识
*/
private String iostorinv_id;
/**
* 出入单明细标识
*/
private String iostorinvdtl_id;
/**
* 明细序号
*/
private BigDecimal seq_no;
/**
* 库区标识
*/
private String sect_id;
/**
* 库区编码
*/
private String sect_code;
/**
* 库区名称
*/
private String sect_name;
/**
* 仓位标识
*/
private String struct_id;
/**
* 仓位编码
*/
private String struct_code;
/**
* 仓位名称
*/
private String struct_name;
/**
* 物料标识
*/
private String material_id;
/**
* 批次
*/
private String pcsn;
/**
* 品质类型
*/
private String quality_scode;
/**
* 执行状态
*/
private String work_status;
/**
* 任务标识
*/
private String task_id;
/**
* 存储载具标识
*/
private String storagevehicle_id;
/**
* 存储载具编码
*/
private String storagevehicle_code;
/**
* 是否已下发
*/
private String is_issued;
/**
* 数量计量单位标识
*/
private String qty_unit_id;
/**
* 数量计量单位名称
*/
private String qty_unit_name;
/**
* 计划数量
*/
private BigDecimal plan_qty;
/**
* 实际数量
*/
private BigDecimal real_qty;
/**
* 出入点位标识
*/
private String point_id;
/**
* 箱号
*/
private String box_no;
/**
* 是否超期
*/
private String is_overdue;
/**
* 入库时间
*/
private String instorage_time;
/**
* 是否回传
*/
private String is_upload;
private String task_code;
private String task_type;
private String task_status;
private String sap_pcsn;
private String width_standard;
private String task_type_name;
}

8
lms/nladmin-ui/src/views/wms/st/outbill/ViewDialog.vue
View File

@@ -113,6 +113,7 @@
<el-card class="box-card" shadow="never" :body-style="{padding:'0'}">
<!--表格渲染-->
<el-table
v-loading="loading"
ref="table"
:data="tableDtl"
style="width: 100%;"
@@ -148,6 +149,7 @@
<el-card class="box-card" shadow="never" :body-style="{padding:'0'}">
<!--表格渲染-->
<el-table
v-loading="loading2"
ref="table2"
:data="tabledis"
style="width: 100%;"
@@ -202,6 +204,8 @@ export default {
data() {
return {
dialogVisible: false,
loading2: false,
loading: true,
tableDtl: [],
tabledis: [],
storlist: [],
@@ -259,6 +263,7 @@ export default {
},
handleDtlCurrentChange(current) {
if (current !== null) {
this.loading2 = true
this.tabledis = []
this.currentdtl = current
this.queryTableDdis()
@@ -280,6 +285,7 @@ export default {
queryTableDtl() {
checkoutbill.getOutBillDtl({ 'iostorinv_id': this.form.iostorinv_id }).then(res => {
this.tableDtl = res
this.loading = false
})
},
queryTableDdis() {
@@ -288,6 +294,8 @@ export default {
this.tabledis = res
}).catch(() => {
this.tabledis = []
}).finally(() => {
this.loading2 = false
})
}
}