From ddca1d2e7d8d3a531a67593cf7f1f7620d50cdf2 Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Fri, 1 Dec 2023 11:35:49 +0800
Subject: [PATCH] =?UTF-8?q?update=20-=20=E7=8F=AD=E7=BB=84=E5=8A=A0?=
 =?UTF-8?q?=E5=88=97=E3=80=81=E7=89=A9=E6=96=99=E5=8A=A0=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/SAPPutStorageServiceImpl.java        |  1 +
 .../aucma/base/domain/BaseMaterialInfo.java   | 12 ++++
 .../aucma/base/domain/BaseTeamMembers.java    | 56 +++++++++++++++++++
 .../mapper/base/BaseMaterialinfoMapper.xml    |  5 ++
 .../mapper/base/BaseTeamMembersMapper.xml     | 24 +++++++-
 .../mapper/base/BaseWorkUnitMapper.xml        |  2 +-
 .../service/impl/BaseBomInfoServiceImpl.java  |  5 +-
 .../impl/ProductPlanInfoServiceImpl.java      |  3 +-
 .../mapper/report/ReportPointDnbMapper.xml    |  2 +-
 9 files changed, 104 insertions(+), 6 deletions(-)

diff --git a/aucma-api/src/main/java/com/aucma/api/service/impl/SAPPutStorageServiceImpl.java b/aucma-api/src/main/java/com/aucma/api/service/impl/SAPPutStorageServiceImpl.java
index 3724dec..1b05b57 100644
--- a/aucma-api/src/main/java/com/aucma/api/service/impl/SAPPutStorageServiceImpl.java
+++ b/aucma-api/src/main/java/com/aucma/api/service/impl/SAPPutStorageServiceImpl.java
@@ -75,6 +75,7 @@ public class SAPPutStorageServiceImpl implements ISAPPutStorageService {
                 materialInfo.setPlantCode(map.get("WERKS"));
                 materialInfo.setMaterialUnit(map.get("MEINS"));
                 materialInfo.setMaterialMatkl(map.get("MATKL"));
+                materialInfo.setDISPO(map.get("DISPO"));
                 materialInfo.setIncrementDate(DateUtils.dateTime(DateUtils.YYYY_MM_DD,map.get("UDATE")));
                 baseMaterialInfoService.insertBaseMaterialInfo(materialInfo);
                 baseMaterialInfoArrayList.add(materialInfo);
diff --git a/aucma-base/src/main/java/com/aucma/base/domain/BaseMaterialInfo.java b/aucma-base/src/main/java/com/aucma/base/domain/BaseMaterialInfo.java
index b4edb77..8623da2 100644
--- a/aucma-base/src/main/java/com/aucma/base/domain/BaseMaterialInfo.java
+++ b/aucma-base/src/main/java/com/aucma/base/domain/BaseMaterialInfo.java
@@ -99,6 +99,18 @@ public class BaseMaterialInfo extends BaseEntity
     @Excel(name = "增量日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date incrementDate;
 
+    /** SAP计划员（100=成品;200=箱体;300=门体） */
+    @Excel(name = "SAP计划员")
+    private String DISPO;
+
+    public String getDISPO() {
+        return DISPO;
+    }
+
+    public void setDISPO(String DISPO) {
+        this.DISPO = DISPO;
+    }
+
     public Date getIncrementDate() {
         return incrementDate;
     }
diff --git a/aucma-base/src/main/java/com/aucma/base/domain/BaseTeamMembers.java b/aucma-base/src/main/java/com/aucma/base/domain/BaseTeamMembers.java
index e078349..1830da1 100644
--- a/aucma-base/src/main/java/com/aucma/base/domain/BaseTeamMembers.java
+++ b/aucma-base/src/main/java/com/aucma/base/domain/BaseTeamMembers.java
@@ -71,6 +71,12 @@ public class BaseTeamMembers extends BaseEntity {
     @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date createdTime;
 
+    /**
+     * 班次（1=白班,2=夜班）
+     */
+    @Excel(name = "班次")
+    private Long classes;
+
     /**
      * 更新人
      */
@@ -84,6 +90,56 @@ public class BaseTeamMembers extends BaseEntity {
     @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date updatedTime;
 
+    /**
+     * 开始时间
+     */
+    @Excel(name = "开始时间")
+    private String startTime;
+
+    /**
+     * 结束时间
+     */
+    @Excel(name = "结束时间")
+    private String endTime;
+
+    /**
+     * 休息时间
+     */
+    @Excel(name = "休息时间")
+    private String dineTime;
+
+    public Long getClasses() {
+        return classes;
+    }
+
+    public void setClasses(Long classes) {
+        this.classes = classes;
+    }
+
+    public String getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(String startTime) {
+        this.startTime = startTime;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
+
+    public String getDineTime() {
+        return dineTime;
+    }
+
+    public void setDineTime(String dineTime) {
+        this.dineTime = dineTime;
+    }
+
     public String getProductLineName() {
         return productLineName;
     }
diff --git a/aucma-base/src/main/resources/mapper/base/BaseMaterialinfoMapper.xml b/aucma-base/src/main/resources/mapper/base/BaseMaterialinfoMapper.xml
index ee79716..7dc1df3 100644
--- a/aucma-base/src/main/resources/mapper/base/BaseMaterialinfoMapper.xml
+++ b/aucma-base/src/main/resources/mapper/base/BaseMaterialinfoMapper.xml
@@ -22,6 +22,7 @@
         <result property="updatedBy"    column="updated_by"    />
         <result property="updatedTime"    column="updated_time"    />
         <result property="incrementDate"    column="increment_date"    />
+        <result property="DISPO"    column="DISPO"    />
     </resultMap>
 
     <sql id="selectBaseMaterialInfoVo">
@@ -33,6 +34,7 @@
                ml.material_type,
                ml.material_unit,
                ml.material_matkl,
+               ml.DISPO,
                ml.material_specifications,
                ml.plant_code,
                bf.factory_name plantName,
@@ -98,6 +100,7 @@
             <if test="createdTime != null">created_time,</if>
             <if test="updatedBy != null">updated_by,</if>
             <if test="updatedTime != null">updated_time,</if>
+            <if test="DISPO != null">DISPO,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="objId != null">#{objId},</if>
@@ -117,6 +120,7 @@
             <if test="createdTime != null">#{createdTime},</if>
             <if test="updatedBy != null">#{updatedBy},</if>
             <if test="updatedTime != null">#{updatedTime},</if>
+            <if test="DISPO != null">#{DISPO},</if>
         </trim>
     </insert>
 
@@ -139,6 +143,7 @@
             <if test="createdTime != null">created_time = #{createdTime},</if>
             <if test="updatedBy != null">updated_by = #{updatedBy},</if>
             <if test="updatedTime != null">updated_time = #{updatedTime},</if>
+            <if test="DISPO != null">DISPO = #{DISPO},</if>
         </trim>
         where obj_id = #{objId}
     </update>
diff --git a/aucma-base/src/main/resources/mapper/base/BaseTeamMembersMapper.xml b/aucma-base/src/main/resources/mapper/base/BaseTeamMembersMapper.xml
index 611b4bf..81b7653 100644
--- a/aucma-base/src/main/resources/mapper/base/BaseTeamMembersMapper.xml
+++ b/aucma-base/src/main/resources/mapper/base/BaseTeamMembersMapper.xml
@@ -16,6 +16,10 @@
             <result property="createdTime"    column="created_time"    />
             <result property="updatedBy"    column="updated_by"    />
             <result property="updatedTime"    column="updated_time"    />
+            <result property="startTime"    column="start_time"    />
+            <result property="endTime"    column="end_time"    />
+            <result property="dineTime"    column="dine_time"    />
+            <result property="classes"    column="classes"    />
     </resultMap>
 
     <sql id="selectBaseTeamMembersVo">
@@ -29,7 +33,11 @@
                tm.created_by,
                tm.created_time,
                tm.updated_by,
-               tm.updated_time
+               tm.updated_time,
+               tm.start_time,
+               tm.end_time,
+               tm.dine_time,
+               tm.classes
         from base_teammembers tm
                  left join base_productline bpl on bpl.PRODUCT_LINE_CODE = tm.PRODUCT_LINE_CODE
     </sql>
@@ -38,6 +46,7 @@
         <include refid="selectBaseTeamMembersVo"/>
         <where>
                         <if test="teamCode != null  and teamCode != ''"> and tm.team_code = #{teamCode}</if>
+                        <if test="classes != null  and classes != ''"> and tm.classes = #{classes}</if>
                         <if test="teamName != null  and teamName != ''"> and tm.team_name like concat(concat('%', #{teamName}), '%')</if>
                         <if test="teamHead != null  and teamHead != ''"> and tm.team_head = #{teamHead}</if>
                         <if test="productLineCode != null  and productLineCode != ''"> and tm.product_line_code = #{productLineCode}</if>
@@ -47,6 +56,7 @@
                         <if test="updatedBy != null  and updatedBy != ''"> and tm.updated_by = #{updatedBy}</if>
                         <if test="updatedTime != null "> and tm.updated_time = #{updatedTime}</if>
         </where>
+        ORDER BY tm.team_code
     </select>
 
     <select id="selectBaseTeamMembersByObjId" parameterType="Long" resultMap="BaseTeamMembersResult">
@@ -70,6 +80,10 @@
                 <if test="createdTime != null">created_time,</if>
                 <if test="updatedBy != null">updated_by,</if>
                 <if test="updatedTime != null">updated_time,</if>
+                <if test="startTime != null">start_time,</if>
+                <if test="endTime != null">end_time,</if>
+                <if test="dineTime != null">dine_time,</if>
+                <if test="classes != null">classes,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
                 <if test="objId != null">#{objId},</if>
@@ -82,6 +96,10 @@
                 <if test="createdTime != null">#{createdTime},</if>
                 <if test="updatedBy != null">#{updatedBy},</if>
                 <if test="updatedTime != null">#{updatedTime},</if>
+                <if test="startTime != null">#{startTime},</if>
+                <if test="endTime != null">#{endTime},</if>
+                <if test="dineTime != null">#{dineTime},</if>
+                <if test="classes != null">#{classes},</if>
         </trim>
     </insert>
 
@@ -97,6 +115,10 @@
                     <if test="createdTime != null">created_time = #{createdTime},</if>
                     <if test="updatedBy != null">updated_by = #{updatedBy},</if>
                     <if test="updatedTime != null">updated_time = #{updatedTime},</if>
+                    <if test="startTime != null">start_time = #{startTime},</if>
+                    <if test="endTime != null">end_time = #{endTime},</if>
+                    <if test="dineTime != null">dine_time = #{dineTime},</if>
+                    <if test="classes != null">classes = #{classes},</if>
         </trim>
         where obj_id = #{objId}
     </update>
diff --git a/aucma-base/src/main/resources/mapper/base/BaseWorkUnitMapper.xml b/aucma-base/src/main/resources/mapper/base/BaseWorkUnitMapper.xml
index f730f09..363e1c2 100644
--- a/aucma-base/src/main/resources/mapper/base/BaseWorkUnitMapper.xml
+++ b/aucma-base/src/main/resources/mapper/base/BaseWorkUnitMapper.xml
@@ -53,7 +53,7 @@
 
     <insert id="insertBaseWorkUnit" parameterType="BaseWorkUnit">
         <selectKey keyProperty="objId" resultType="long" order="BEFORE">
-            SELECT seq_report_day_dnb.NEXTVAL as objId FROM DUAL
+            SELECT seq_base_work_unit.NEXTVAL as objId FROM DUAL
         </selectKey>
         insert into base_work_unit
         <trim prefix="(" suffix=")" suffixOverrides=",">
diff --git a/aucma-production/src/main/java/com/aucma/production/service/impl/BaseBomInfoServiceImpl.java b/aucma-production/src/main/java/com/aucma/production/service/impl/BaseBomInfoServiceImpl.java
index 80553b6..e514364 100644
--- a/aucma-production/src/main/java/com/aucma/production/service/impl/BaseBomInfoServiceImpl.java
+++ b/aucma-production/src/main/java/com/aucma/production/service/impl/BaseBomInfoServiceImpl.java
@@ -2,6 +2,7 @@ package com.aucma.production.service.impl;
 
 import java.util.List;
 
+import com.aucma.common.exception.ServiceException;
 import com.aucma.common.exception.base.BaseException;
 import com.aucma.common.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -146,10 +147,10 @@ public class BaseBomInfoServiceImpl implements IBaseBomInfoService
     public void checkBomInfo(List<BaseBomInfo> baseBomInfoList) {
         for (BaseBomInfo baseBomInfo : baseBomInfoList) {
             if (baseBomInfo.getStandardAmount() < 1){
-                throw new BaseException("生产BOM：" + baseBomInfo.getMaterialName() + " 标准数量小于1！");
+                throw new ServiceException("生产BOM：" + baseBomInfo.getMaterialName() + " 标准数量小于1！");
             }
             if (StringUtils.isEmpty(baseBomInfo.getProductLineCode())){
-                throw new BaseException("生产BOM：" + baseBomInfo.getMaterialName() + " 未分配工位！");
+                throw new ServiceException("生产BOM：" + baseBomInfo.getMaterialName() + " 未分配工位！");
             }
         }
     }
diff --git a/aucma-production/src/main/java/com/aucma/production/service/impl/ProductPlanInfoServiceImpl.java b/aucma-production/src/main/java/com/aucma/production/service/impl/ProductPlanInfoServiceImpl.java
index 129a1c4..60873c0 100644
--- a/aucma-production/src/main/java/com/aucma/production/service/impl/ProductPlanInfoServiceImpl.java
+++ b/aucma-production/src/main/java/com/aucma/production/service/impl/ProductPlanInfoServiceImpl.java
@@ -5,6 +5,7 @@ import java.util.List;
 
 import com.aucma.base.domain.BaseOrderInfo;
 import com.aucma.base.service.IBaseOrderInfoService;
+import com.aucma.common.exception.ServiceException;
 import com.aucma.common.exception.base.BaseException;
 import com.aucma.common.utils.DateUtils;
 import com.aucma.common.utils.StringUtils;
@@ -157,7 +158,7 @@ public class ProductPlanInfoServiceImpl implements IProductPlanInfoService
             baseOrderInfo.setIsRelease(0L);
             baseOrderInfoService.updateBaseOrderInfo(baseOrderInfo);
         } catch (Exception e) {
-            throw new BaseException(e.getMessage());
+            throw new ServiceException(e.getMessage());
         }
         return true;
     }
diff --git a/aucma-report/src/main/resources/mapper/report/ReportPointDnbMapper.xml b/aucma-report/src/main/resources/mapper/report/ReportPointDnbMapper.xml
index 8bd7f40..4e9d2a7 100644
--- a/aucma-report/src/main/resources/mapper/report/ReportPointDnbMapper.xml
+++ b/aucma-report/src/main/resources/mapper/report/ReportPointDnbMapper.xml
@@ -49,7 +49,7 @@
 
     <insert id="insertReportPointDnb" parameterType="ReportPointDnb">
         <selectKey keyProperty="objId" resultType="long" order="BEFORE">
-            SELECT seq_base_deviceledger.NEXTVAL as objId FROM DUAL
+            SELECT seq_report_point_dnb.NEXTVAL as objId FROM DUAL
         </selectKey>
         insert into report_point_dnb
         <trim prefix="(" suffix=")" suffixOverrides=",">