Browse Source

2026-10-14

优化
master
fengyuan_yang 1 month ago
parent
commit
ee3e247c97
  1. 1
      src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java
  2. 2
      src/main/resources/mapper/schedule/ScheduleMapper.xml
  3. 11
      src/main/resources/mapper/shopOrder/ProductionReportMapper.xml

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

@ -5955,6 +5955,7 @@ public class ScheduleServiceImpl implements ScheduleService {
} }
@Override @Override
@Transactional(rollbackFor = Exception.class)
public void updateProductionStatus(SearchScheduleData inData) { public void updateProductionStatus(SearchScheduleData inData) {
if (inData.getCurrentTime() == null || inData.getCurrentTime().isEmpty()) { if (inData.getCurrentTime() == null || inData.getCurrentTime().isEmpty()) {
inData.setCurrentTime(DateUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss")); inData.setCurrentTime(DateUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss"));

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

@ -587,7 +587,7 @@
</where> </where>
</update> </update>
<!--按照派工单号查询派工单的数据-->
<!--按照派工单号查询派工单的数据--> <!--2026-10-14 按照同工单+同工序汇总产量 -->
<select id="getScheduleDataBySeqNo" parameterType="SearchScheduleData" resultType="ScheduleData"> <select id="getScheduleDataBySeqNo" parameterType="SearchScheduleData" resultType="ScheduleData">
Select Select
T.Site site, T.Site site,

11
src/main/resources/mapper/shopOrder/ProductionReportMapper.xml

@ -399,7 +399,16 @@
SELECT SELECT
A.site, A.bu_no, A.RollNo, A.RollQty, A.parent_roll_no, A.parent_roll_type, A.site, A.bu_no, A.RollNo, A.RollQty, A.parent_roll_no, A.parent_roll_type,
A.OrderNo, A.CreatedOpsSeqNo, A.Createdby AS productionResourceID, A.OrderNo, A.CreatedOpsSeqNo, A.Createdby AS productionResourceID,
A.CreatedOpsItemNo, A.Createdby, A.CreatedDate,
A.CreatedOpsItemNo,
STUFF((
SELECT DISTINCT ',' + L.operator
FROM sfdc_operator_list L WITH(NOLOCK)
WHERE L.site = A.site
AND L.roll_No = A.OriRollNo
AND L.operator IS NOT NULL
FOR XML PATH(''), TYPE
).value('.', 'NVARCHAR(MAX)'), 1, 1, '') AS Createdby,
A.CreatedDate,
B.OrderNo as consumeOrderNo, B.SeqNo as consumeSeqNo, B.Reportedby as consumptionResourceID, B.OrderNo as consumeOrderNo, B.SeqNo as consumeSeqNo, B.Reportedby as consumptionResourceID,
B.ItemNo as consumeItemNo, B.StartDate as date1, B.ReportDate as date2, B.HistType, B.ItemNo as consumeItemNo, B.StartDate as date1, B.ReportDate as date2, B.HistType,
A.RollType, A.RollType,

Loading…
Cancel
Save