Browse Source

混炼胶报工同步QMS检验

master
常熟吴彦祖 4 weeks ago
parent
commit
110344f6dd
  1. 4
      src/main/java/com/heai/modules/production/dao/DailyPlanMapper.java
  2. 7
      src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java
  3. 59
      src/main/resources/mapper/production/DailyPlanMapper.xml

4
src/main/java/com/heai/modules/production/dao/DailyPlanMapper.java

@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.heai.modules.app.entity.ProductionWarehouseData; import com.heai.modules.app.entity.ProductionWarehouseData;
import com.heai.modules.app.entity.SoBomData; import com.heai.modules.app.entity.SoBomData;
import com.heai.modules.board.entity.PartStock; import com.heai.modules.board.entity.PartStock;
import com.heai.modules.pms.entity.InspectInfoToQmsDto;
import com.heai.modules.production.entity.*; import com.heai.modules.production.entity.*;
import com.heai.modules.sys.entity.SysRoleEntity; import com.heai.modules.sys.entity.SysRoleEntity;
import com.heai.modules.sys.entity.VpPartData; import com.heai.modules.sys.entity.VpPartData;
@ -1053,4 +1054,7 @@ public interface DailyPlanMapper {
@Param("endDate") String endDate); @Param("endDate") String endDate);
List<PartStock> getPartToScheduleQtyInfo(@Param("site")String site,@Param("sql") String whereSQL); List<PartStock> getPartToScheduleQtyInfo(@Param("site")String site,@Param("sql") String whereSQL);
List<InspectInfoToQmsDto> getInspectDataForQMS(@Param("site")String site,@Param("sql") String whereSQL);
} }

7
src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java

@ -9,6 +9,8 @@ import com.heai.modules.app.entity.SoBomData;
import com.heai.modules.board.dao.BoardMapper; import com.heai.modules.board.dao.BoardMapper;
import com.heai.modules.board.entity.PartStock; import com.heai.modules.board.entity.PartStock;
import com.heai.modules.board.entity.ViewKanbanSoHunlianPlanData; import com.heai.modules.board.entity.ViewKanbanSoHunlianPlanData;
import com.heai.modules.pms.entity.InspectInfoToQmsDto;
import com.heai.modules.pms.service.SynInspectInfoToQmsService;
import com.heai.modules.production.config.TCPClient; import com.heai.modules.production.config.TCPClient;
import com.heai.modules.production.dao.*; import com.heai.modules.production.dao.*;
import com.heai.modules.production.entity.*; import com.heai.modules.production.entity.*;
@ -72,7 +74,8 @@ public class DailyPlanServiceImpl implements DailyPlanService {
private InventoryStockDao inventoryStockDao; private InventoryStockDao inventoryStockDao;
@Autowired @Autowired
private SqlSession sqlSession; private SqlSession sqlSession;
@Autowired
private SynInspectInfoToQmsService synInspectInfoToQmsService;
@Override @Override
public List<ShopOrderData> getShopOrderData( DailyPlanInData dailyPlanInData){ public List<ShopOrderData> getShopOrderData( DailyPlanInData dailyPlanInData){
List<ShopOrderData> data = dailyPlanMapper.getShopOrderData(dailyPlanInData); List<ShopOrderData> data = dailyPlanMapper.getShopOrderData(dailyPlanInData);
@ -486,6 +489,8 @@ public class DailyPlanServiceImpl implements DailyPlanService {
if(big==1) { if(big==1) {
dailyPlanMapper.saveSOOpsTransferHeader(inData); dailyPlanMapper.saveSOOpsTransferHeader(inData);
dailyPlanMapper.saveSOOpsTransferDetail(inData); dailyPlanMapper.saveSOOpsTransferDetail(inData);
List<InspectInfoToQmsDto> inspect=dailyPlanMapper.getInspectDataForQMS(inData.getSite(),inData.getTransNo());
synInspectInfoToQmsService.synInspectInfoToQms(inspect);
transData = dailyPlanMapper.getTransData(inData.getSite(), inData.getTransNo()); transData = dailyPlanMapper.getTransData(inData.getSite(), inData.getTransNo());
} }
return transData; return transData;

59
src/main/resources/mapper/production/DailyPlanMapper.xml

@ -1867,4 +1867,63 @@
<select id="getPartToScheduleQtyInfo" resultType="com.heai.modules.board.entity.PartStock"> <select id="getPartToScheduleQtyInfo" resultType="com.heai.modules.board.entity.PartStock">
exec dbo.get_Part_ToSchedule_QtyInfo #{site},#{sql} exec dbo.get_Part_ToSchedule_QtyInfo #{site},#{sql}
</select> </select>
<select id="getInspectDataForQMS" resultType="InspectInfoToQmsDto">
SELECT
h.TransNo,
h.Site,
h.FromProLineNo,
h.ToProLineNo,
h.ToWarehouseID,
h.FromEnteredby,
h.FromEnteredDate,
h.TransDate,
h.ToReceiver,
h.FromReceiver,
h.FromRemark,
h.ToRemark,
h.ConfirmedFlag,
h.ToConfirmedBy,
h.ToEnteredby,
h.ToEnteredDate,
h.LatestUpdatedBy,
h.LatestUpdatedDate,
h.RecordVersion,
h.Status,
h.ToTypeFlag_DB AS ToTypeFlagDB, -- 注意:Java 字段是 toTypeFlagDB
h.ToTypeFlag,
h.ConfirmedTransNo,
h.need_inspect_flag AS NeedInspectFlag, -- Java 是 needInspectFlag(驼峰)
h.inspected_flag AS InspectedFlag,
h.inspect_result AS InspectResult,
h.inspect_remark AS InspectRemark,
h.NeedReceiveFlag,
d.ItemNo,
d.FromOpsID,
d.FromWorkCenterNo,
d.ToWorkCenterNo,
d.ToOpsID,
d.OrderNo,
d.PartNo,
d.TransQty,
d.ConfirmQty,
d.TaskNo,
d.InsStatus,
d.ToConfirmQty,
d.seqNo,
d.boxWeight,
d.OrderRef1,
d.OrderRef2,
d.OrderRef3,
d.OrderRef4,
d.OrderRef5
FROM SOOpsTransferHeader h
INNER JOIN SOOpsTransferDetail d
ON h.TransNo = d.TransNo
AND h.Site = d.Site
where h.Site = #{site}
and h.TransNo = #{transNo}
</select>
</mapper> </mapper>
Loading…
Cancel
Save