fengyuan_yang
/
boying-java
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

2026-04-15 

领料记录增加查询条件
master
fengyuan_yang 2 months ago
parent
296e9e24c2
commit
ce817a2394
5 changed files with 76 additions and 38 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      src/main/java/com/gaotao/modules/schedule/controller/ScheduleController.java
  2. 9
      src/main/java/com/gaotao/modules/schedule/mapper/ScheduleMapper.java
  3. 8
      src/main/java/com/gaotao/modules/schedule/service/ScheduleService.java
  4. 5
      src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java
  5. 84
      src/main/resources/mapper/schedule/ScheduleMapper.xml

8
src/main/java/com/gaotao/modules/schedule/controller/ScheduleController.java
View File

@ -2163,6 +2163,11 @@ public class ScheduleController extends AbstractController {
String partNo = (String) params.get("partNo");
Integer page = params.get("page") != null ? Integer.valueOf(params.get("page").toString()) : 1;
Integer limit = params.get("limit") != null ? Integer.valueOf(params.get("limit").toString()) : 20;
String transactionId = (String) params.get("transactionId");
String documentType = (String) params.get("documentType");
String rollNo = (String) params.get("rollNo");
String status = (String) params.get("status");
String consumedFlag = (String) params.get("consumedFlag");
if (site == null || site.isEmpty()) {
return R.error("站点不能为空").put("code", 400);
@ -2174,7 +2179,8 @@ public class ScheduleController extends AbstractController {
return R.error("物料编码不能为空").put("code", 400);
}
PageUtils pageUtils = scheduleService.getMaterialRecordList(site, orderNo, partNo, page, limit);
PageUtils pageUtils = scheduleService.getMaterialRecordList(site, orderNo, partNo, page, limit,
transactionId, documentType, rollNo, status, consumedFlag);
return R.ok()
.put("code", 0)
.put("msg", "success")

9
src/main/java/com/gaotao/modules/schedule/mapper/ScheduleMapper.java
View File

@ -788,9 +788,16 @@ public interface ScheduleMapper {
* @param site 站点
* @param orderNo 工单号
* @param partNo 物料编码
* @param transactionId 变动单号
* @param documentType 变动类型
* @param rollNo 标签条码
* @param status 标签状态
* @param consumedFlag 是否耗用
* @return 领料记录列表
*/
List<Map<String, Object>> getMaterialRecordList(@Param("site") String site, @Param("orderNo") String orderNo, @Param("partNo") String partNo);
List<Map<String, Object>> getMaterialRecordList(@Param("site") String site, @Param("orderNo") String orderNo, @Param("partNo") String partNo,
@Param("transactionId") String transactionId, @Param("documentType") String documentType,
@Param("rollNo") String rollNo, @Param("status") String status, @Param("consumedFlag") String consumedFlag);
/**
* 调用存储过程 sfdcRollsOpsReportExecute

8
src/main/java/com/gaotao/modules/schedule/service/ScheduleService.java
View File

@ -1304,9 +1304,15 @@ public interface ScheduleService {
* @param partNo 物料编码
* @param page 当前页
* @param limit 每页记录数
* @param transactionId 变动单号
* @param documentType 变动类型
* @param rollNo 标签条码
* @param status 标签状态
* @param consumedFlag 是否耗用
* @return 领料记录分页数据
*/
PageUtils getMaterialRecordList(String site, String orderNo, String partNo, int page, int limit);
PageUtils getMaterialRecordList(String site, String orderNo, String partNo, int page, int limit,
String transactionId, String documentType, String rollNo, String status, String consumedFlag);
/**
* @description: 打开材料卷（重新激活已完成的材料）

5
src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java
View File

@ -5699,9 +5699,10 @@ public class ScheduleServiceImpl implements ScheduleService {
}
@Override
public PageUtils getMaterialRecordList(String site, String orderNo, String partNo, int page, int limit) {
public PageUtils getMaterialRecordList(String site, String orderNo, String partNo, int page, int limit,
String transactionId, String documentType, String rollNo, String status, String consumedFlag) {
com.github.pagehelper.Page<Map<String, Object>> pageInfo = com.github.pagehelper.PageHelper.startPage(page, limit);
List<Map<String, Object>> list = scheduleMapper.getMaterialRecordList(site, orderNo, partNo);
List<Map<String, Object>> list = scheduleMapper.getMaterialRecordList(site, orderNo, partNo, transactionId, documentType, rollNo, status, consumedFlag);
return new PageUtils(list, (int)pageInfo.getTotal(), limit, page);
}

84
src/main/resources/mapper/schedule/ScheduleMapper.xml
View File

@ -2061,39 +2061,57 @@
<!-- 获取领料记录 -->
<select id="getMaterialRecordList" resultType="java.util.Map">
select
A.site,
A.bu_no as buNo,
A.transaction_id as transactionId,
A.document_type as documentType,
A.document_no as documentNo,
A.roll_no as rollNo,
B.status, --标签状态
(CASE WHEN B.consumed_flag = 'Y' THEN '已消耗' ELSE '未使用' END) consumedFlag , --是否耗用
A.roll_qty as rollQty,
A.batch_no as batchNo,
A.transaction_by as transactionBy,
A.transaction_date as transactionDate
from StockTransactionLog A WITH(NOLOCK)
INNER JOIN inventory_stock B WITH(NOLOCK) ON A.site = B.site AND A.roll_no = B.roll_no
where A.site =#{site} and A.order_no = #{orderNo} AND a.part_no = #{partNo} and a.document_type in ('生产领料','生产退仓')
UNION ALL
SELECT
A.site,
A.bu_no buNo,
A.orderref1 as transactionId,
A.orderref0 as documentType,
A.orderref1 as documentNo,
A.roll_no rollNo,
A.status, --标签状态
(CASE WHEN a.consumed_flag = 'Y' THEN '已消耗' ELSE '未使用' END) consumedFlag , --是否使用
a.qty_on_hand as rollQty,
a.batch_no batchNo,
create_by as transactionBy ,
latest_in_date as transactionDate
FROM inventory_stock A WITH(NOLOCK)
WHERE A.site =#{site} and A.orderref1 = #{orderNo} AND A.part_no = #{partNo} and a.orderref0 ='生产退仓' AND a.status = '待入'
select * from (
select
A.site,
A.bu_no as buNo,
A.transaction_id as transactionId,
A.document_type as documentType,
A.document_no as documentNo,
A.roll_no as rollNo,
B.status, --标签状态
(CASE WHEN B.consumed_flag = 'Y' THEN '已消耗' ELSE '未使用' END) consumedFlag , --是否耗用
A.roll_qty as rollQty,
A.batch_no as batchNo,
A.transaction_by as transactionBy,
A.transaction_date as transactionDate
from StockTransactionLog A WITH(NOLOCK)
INNER JOIN inventory_stock B WITH(NOLOCK) ON A.site = B.site AND A.roll_no = B.roll_no
where A.site =#{site} and A.order_no = #{orderNo} AND a.part_no = #{partNo} and a.document_type in ('生产领料','生产退仓')
UNION ALL
SELECT
A.site,
A.bu_no buNo,
A.orderref1 as transactionId,
A.orderref0 as documentType,
A.orderref1 as documentNo,
A.roll_no rollNo,
A.status, --标签状态
(CASE WHEN a.consumed_flag = 'Y' THEN '已消耗' ELSE '未使用' END) consumedFlag , --是否使用
a.qty_on_hand as rollQty,
a.batch_no batchNo,
create_by as transactionBy ,
latest_in_date as transactionDate
FROM inventory_stock A WITH(NOLOCK)
WHERE A.site =#{site} and A.orderref1 = #{orderNo} AND A.part_no = #{partNo} and a.orderref0 ='生产退仓' AND a.status = '待入'
) T
<where>
<if test="transactionId != null and transactionId != ''">
and T.transactionId like concat('%', #{transactionId}, '%')
</if>
<if test="documentType != null and documentType != ''">
and T.documentType = #{documentType}
</if>
<if test="rollNo != null and rollNo != ''">
and T.rollNo like concat('%', #{rollNo}, '%')
</if>
<if test="status != null and status != ''">
and T.status = #{status}
</if>
<if test="consumedFlag != null and consumedFlag != ''">
and T.consumedFlag = #{consumedFlag}
</if>
</where>
</select>
<!-- 调用存储过程 sfdcRollsOpsReportExecute 用于打开材料卷 -->

Write Preview
Loading…
Cancel
Save