From 0926a39aef0c9fdcee823e189bac2e532c6f0d4b Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期日, 20 十月 2024 21:06:51 +0800
Subject: [PATCH] 1、对接原片仓储opc 2、关闭liquibase,仅需要有脚本变动的时候开启在执行,避免启动报错 3、原片仓储新增入库请求、出库情况,调整整体逻辑,增加格子号架子号,任务表、详情表、工位表都需要记录架子信息,用于任务执行过程中,架子在执行过程中可返回架子对应的工位上,避免架子乱放后格子架子号不对应的情况发生。

---
 hangzhoumesParent/common/servicebase/src/main/resources/mapper/TemperingGlassInfoMapper.xml |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/hangzhoumesParent/common/servicebase/src/main/resources/mapper/TemperingGlassInfoMapper.xml b/hangzhoumesParent/common/servicebase/src/main/resources/mapper/TemperingGlassInfoMapper.xml
index 73f527f..48ea8cc 100644
--- a/hangzhoumesParent/common/servicebase/src/main/resources/mapper/TemperingGlassInfoMapper.xml
+++ b/hangzhoumesParent/common/servicebase/src/main/resources/mapper/TemperingGlassInfoMapper.xml
@@ -2,11 +2,14 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.mes.temperingglass.mapper.TemperingGlassInfoMapper">
     <insert id="saveBatch">
-        INSERT INTO tempering_glass_info ( glass_id, width, height, thickness, tempering_layout_id,
-        tempering_feed_sequence, "state" ) VALUES
+        INSERT INTO tempering_glass_info (glass_id, flow_card_id, glass_type, width, height, thickness, filmsid,
+        ishorizontal, tempering_layout_id,
+        tempering_feed_sequence, x_coordinate, y_coordinate, angle, state, slot, engineer_id, deleted) VALUES
         <foreach collection="list" item="item" separator=",">
-            (#{item.glassId}, #{item.width}, #{item.height}, #{item.thickness}, #{item.temperingLayoutId},
-            #{item.temperingFeedSequence}, #{item.state})
+            (#{item.glassId}, #{item.flowCardId}, #{item.glassType}, #{item.width}, #{item.height}, #{item.thickness},
+            #{item.filmsid},#{item.ishorizontal},
+            #{item.temperingLayoutId}, #{item.temperingFeedSequence}, #{item.xCoordinate}, #{item.yCoordinate},
+            #{item.angle}, #{item.state}, #{item.slot}, #{item.engineerId}, 0)
         </foreach>
     </insert>
 

--
Gitblit v1.8.0