yinq
/
aucma-mes-back
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update - 班组加列、物料加列

Browse Source
master
yinq 12 months ago
parent 92e5abd811
commit ddca1d2e7d
9 changed files with 104 additions and 6 deletions
Show Stats Download Patch File Download Diff File

1
aucma-api/src/main/java/com/aucma/api/service/impl/SAPPutStorageServiceImpl.java
Unescape Escape View File

@ -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);

12
aucma-base/src/main/java/com/aucma/base/domain/BaseMaterialInfo.java
Unescape Escape View File

@ -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;
}

56
aucma-base/src/main/java/com/aucma/base/domain/BaseTeamMembers.java
Unescape Escape View File

@ -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;
}

5
aucma-base/src/main/resources/mapper/base/BaseMaterialinfoMapper.xml
Unescape Escape View File

@ -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>

24
aucma-base/src/main/resources/mapper/base/BaseTeamMembersMapper.xml
Unescape Escape View File

@ -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>

2
aucma-base/src/main/resources/mapper/base/BaseWorkUnitMapper.xml
Unescape Escape View File

@ -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=",">

5
aucma-production/src/main/java/com/aucma/production/service/impl/BaseBomInfoServiceImpl.java
Unescape Escape View File

@ -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() + " 未分配工位！");
}
}
}

3
aucma-production/src/main/java/com/aucma/production/service/impl/ProductPlanInfoServiceImpl.java
Unescape Escape View File

@ -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;
}

2
aucma-report/src/main/resources/mapper/report/ReportPointDnbMapper.xml
Unescape Escape View File

@ -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=",">

Write Preview
Loading…
Cancel
Save