Browse Source

2025-12-02

机台工作台订单信息
master
fengyuan_yang 8 months ago
parent
commit
ac7747afad
  1. 15
      src/main/java/com/gaotao/modules/schedule/controller/ScheduleController.java
  2. 7
      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. 13
      src/main/resources/mapper/schedule/ScheduleMapper.xml

15
src/main/java/com/gaotao/modules/schedule/controller/ScheduleController.java

@ -1328,6 +1328,21 @@ public class ScheduleController extends AbstractController {
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000));
}
/**
* @Description 查询工单的订单备注信息
* @DateTime 2025/12/2
* @Param [inData]
* @return com.gaotao.common.utils.R
**/
@RequestMapping(value = "getOrderNotesByOrderNo")
public R getOrderNotesByOrderNo(@RequestBody SearchScheduleData inData){
Map<String, Object> result = scheduleService.getOrderNotesByOrderNo(inData);
return R.ok()
.put("code", 200)
.put("row", result)
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000));
}
/**
* @Author LR

7
src/main/java/com/gaotao/modules/schedule/mapper/ScheduleMapper.java

@ -749,4 +749,11 @@ public interface ScheduleMapper {
*/
void updateFixedCarrierBatch(@Param("list") List<Map<String, Object>> list);
/**
* 查询工单的订单备注信息
* @param inData 查询条件site, orderNo
* @return 订单备注信息
*/
Map<String, Object> getOrderNotesByOrderNo(SearchScheduleData inData);
}

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

@ -769,6 +769,14 @@ public interface ScheduleService {
**/
void materialReturnDuringProduction(SearchScheduleData inData);
/**
* @Description 查询工单的订单备注信息
* @DateTime 2025/12/2
* @Param [inData]
* @return java.util.Map<java.lang.String, java.lang.Object>
**/
Map<String, Object> getOrderNotesByOrderNo(SearchScheduleData inData);
/**
* @Author LR
* @Description 产量报告 --检查报告一部分卷数量

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

@ -3767,6 +3767,11 @@ public class ScheduleServiceImpl implements ScheduleService {
return resultList.get(0);
}
@Override
public Map<String, Object> getOrderNotesByOrderNo(SearchScheduleData inData) {
return scheduleMapper.getOrderNotesByOrderNo(inData);
}
@Override
public void checkFinishPartRollWithNoFqc(Map<String, Object> inMap) {
String strPageData = String.valueOf(inMap.get("pageData"));

13
src/main/resources/mapper/schedule/ScheduleMapper.xml

@ -2004,4 +2004,17 @@
</foreach>
</update>
<!-- 查询工单的订单备注信息 -->
<select id="getOrderNotesByOrderNo" parameterType="SearchScheduleData" resultType="java.util.Map">
SELECT TOP 1
B.orderref01 AS orderNotes -- 订单备注信息
FROM ShopOrder A
LEFT JOIN outbound_notification_detail B
ON A.Site = B.site
AND A.bu_no = B.bu_no
AND A.batch_no = B.related_order_no
WHERE A.Site = #{site}
AND A.OrderNo = #{orderNo}
</select>
</mapper>
Loading…
Cancel
Save