From 78d8b00a65285a6fce43948b8c5bc385ac476f84 Mon Sep 17 00:00:00 2001 From: zpl Date: Thu, 2 Sep 2021 13:51:20 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=87=AA=E5=88=B6=E4=BB=B6=E6=89=93?= =?UTF-8?q?=E5=8D=B0=EF=BC=8C=E6=9F=A5=E8=AF=A2=E5=88=B0=E5=A4=9A=E7=AC=94?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=EF=BC=8C=E8=BF=94=E5=9B=9E=E4=B8=80=E6=9D=A1?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../foreverwin/mesnac/common/mapper/PrintLogMapper.java | 2 +- .../mesnac/common/service/impl/PrintLogServiceImpl.java | 7 ++++++- common/src/main/resources/mapper/PrintLogMapper.xml | 1 + 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/common/src/main/java/com/foreverwin/mesnac/common/mapper/PrintLogMapper.java b/common/src/main/java/com/foreverwin/mesnac/common/mapper/PrintLogMapper.java index 67ced48f..267b9540 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/mapper/PrintLogMapper.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/mapper/PrintLogMapper.java @@ -26,6 +26,6 @@ public interface PrintLogMapper extends BaseMapper { */ List getPrintLogListByCondition(PrintLog printLog); - LabelPrintDto findSfcPrintInfoBySfc(@Param("sfc") String sfc, @Param("site") String site); + List findSfcPrintInfoBySfc(@Param("sfc") String sfc, @Param("site") String site); } \ No newline at end of file diff --git a/common/src/main/java/com/foreverwin/mesnac/common/service/impl/PrintLogServiceImpl.java b/common/src/main/java/com/foreverwin/mesnac/common/service/impl/PrintLogServiceImpl.java index 6a8af85a..e71cf46f 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/service/impl/PrintLogServiceImpl.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/service/impl/PrintLogServiceImpl.java @@ -109,7 +109,12 @@ public class PrintLogServiceImpl extends ServiceImpl i @Override public LabelPrintDto findSfcPrintInfoBySfc(String sfc) { - return printLogMapper.findSfcPrintInfoBySfc(sfc,CommonMethods.getSite()); + String site = CommonMethods.getSite(); + List sfcPrintInfoBySfc = printLogMapper.findSfcPrintInfoBySfc(sfc, site); + if (sfcPrintInfoBySfc.size() < 1){ + throw BusinessException.build("未找到数据【未生成库存】！"); + } + return sfcPrintInfoBySfc.get(0); } @Override diff --git a/common/src/main/resources/mapper/PrintLogMapper.xml b/common/src/main/resources/mapper/PrintLogMapper.xml index 439f34b5..3d901386 100644 --- a/common/src/main/resources/mapper/PrintLogMapper.xml +++ b/common/src/main/resources/mapper/PrintLogMapper.xml @@ -584,6 +584,7 @@ LEFT JOIN CUSTOM_FIELDS CF ON CF.HANDLE = I.ITEM_BO AND CF."ATTRIBUTE" = 'DRAWING_REVISION' LEFT JOIN CUSTOM_FIELDS CFA ON CFA.HANDLE = I.ITEM_BO AND CFA."ATTRIBUTE" = 'ACCESSORY_TYPE' WHERE S.SFC = #{sfc} AND I.SITE = #{site} + ORDER BY ZSD.BLANKING_SIZE From 670da5b1f27e0012e1755f7cc0c87cf56592ada5 Mon Sep 17 00:00:00 2001 From: zpl Date: Thu, 2 Sep 2021 13:52:20 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=87=AA=E5=88=B6=E4=BB=B6=E6=89=93?= =?UTF-8?q?=E5=8D=B0=EF=BC=8C=E6=9F=A5=E8=AF=A2=E5=88=B0=E5=A4=9A=E7=AC=94?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=EF=BC=8C=E8=BF=94=E5=9B=9E=E4=B8=80=E6=9D=A1?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mesnac/common/service/impl/PrintLogServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/src/main/java/com/foreverwin/mesnac/common/service/impl/PrintLogServiceImpl.java b/common/src/main/java/com/foreverwin/mesnac/common/service/impl/PrintLogServiceImpl.java index e71cf46f..aa2801ec 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/service/impl/PrintLogServiceImpl.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/service/impl/PrintLogServiceImpl.java @@ -112,7 +112,7 @@ public class PrintLogServiceImpl extends ServiceImpl i String site = CommonMethods.getSite(); List sfcPrintInfoBySfc = printLogMapper.findSfcPrintInfoBySfc(sfc, site); if (sfcPrintInfoBySfc.size() < 1){ - throw BusinessException.build("未找到数据【未生成库存】！"); + throw BusinessException.build("未找到生产的库存数据！"); } return sfcPrintInfoBySfc.get(0); } From c4bda6fe3daaa95d7252e0c612eb33cefeb77db0 Mon Sep 17 00:00:00 2001 From: Leon <3066758958@qq.com> Date: Thu, 2 Sep 2021 15:48:00 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E6=B4=BE=E5=B7=A5?= =?UTF-8?q?=E4=BA=BA=E5=91=98=E5=8D=95=E7=8B=AC=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ReportDataController.java | 17 + .../common/mapper/ReportDataMapper.java | 5 +- .../common/service/ReportDataService.java | 8 + .../service/impl/ReportDataServiceImpl.java | 5 + .../resources/mapper/ReportDataMapper.xml | 8 + .../dispatch/dto/SfcDispatchEmployeeDto.java | 34 ++ .../mapper/SfcDispatchEmployeeMapper.java | 22 ++ .../dispatch/model/SfcDispatchEmployee.java | 119 ++++++ .../service/SfcDispatchEmployeeService.java | 20 + .../impl/SfcDispatchEmployeeServiceImpl.java | 70 ++++ .../service/impl/SfcDispatchServiceImpl.java | 23 +- .../mapper/SfcDispatchEmployeeMapper.xml | 345 ++++++++++++++++++ .../minth/generator/GeneratorApplication.java | 6 +- 13 files changed, 674 insertions(+), 8 deletions(-) create mode 100644 dispatch/src/main/java/com/foreverwin/mesnac/dispatch/dto/SfcDispatchEmployeeDto.java create mode 100644 dispatch/src/main/java/com/foreverwin/mesnac/dispatch/mapper/SfcDispatchEmployeeMapper.java create mode 100644 dispatch/src/main/java/com/foreverwin/mesnac/dispatch/model/SfcDispatchEmployee.java create mode 100644 dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/SfcDispatchEmployeeService.java create mode 100644 dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SfcDispatchEmployeeServiceImpl.java create mode 100644 dispatch/src/main/resources/mapper/SfcDispatchEmployeeMapper.xml diff --git a/common/src/main/java/com/foreverwin/mesnac/common/controller/ReportDataController.java b/common/src/main/java/com/foreverwin/mesnac/common/controller/ReportDataController.java index beb192e0..80d0e6a8 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/controller/ReportDataController.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/controller/ReportDataController.java @@ -39,6 +39,23 @@ public class ReportDataController { } } + /** + * 查询质量检验任务明细 + * + * @param paramMap + * @return + */ + @GetMapping("/findInspectionTaskDetail") + public R findInspectionTaskDetail(@RequestParam(required = false) Map paramMap) { + try { + paramMap.put("site", CommonMethods.getSite()); + List> result = reportDataService.findInspectionTaskDetail(paramMap); + return R.ok(result); + } catch (Exception e) { + return R.failed(e.getMessage()); + } + } + /** * 设备负荷率报表 * 查询设备每日的负荷率 diff --git a/common/src/main/java/com/foreverwin/mesnac/common/mapper/ReportDataMapper.java b/common/src/main/java/com/foreverwin/mesnac/common/mapper/ReportDataMapper.java index a491333d..5147237c 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/mapper/ReportDataMapper.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/mapper/ReportDataMapper.java @@ -7,15 +7,14 @@ import java.util.Map; @Repository public interface ReportDataMapper { + List> findInspectionTask(Map paramMap); + List> findInspectionTaskDetail(Map paramMap); List> findResourceLoadRateInfo(Map paramMap); List> findResourceRepairDataStatInfo(Map paramMap); List> findProductStateInfo(Map paramMap); - - - } diff --git a/common/src/main/java/com/foreverwin/mesnac/common/service/ReportDataService.java b/common/src/main/java/com/foreverwin/mesnac/common/service/ReportDataService.java index a36334e4..fcea297f 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/service/ReportDataService.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/service/ReportDataService.java @@ -12,6 +12,14 @@ public interface ReportDataService { */ List> findInspectionTask(Map paramMap); + /** + * 查询质量检验任务明细 + * + * @param paramMap + * @return + */ + List> findInspectionTaskDetail(Map paramMap); + /** * 设备负荷率报表 * diff --git a/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ReportDataServiceImpl.java b/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ReportDataServiceImpl.java index 68042807..330aa347 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ReportDataServiceImpl.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ReportDataServiceImpl.java @@ -22,6 +22,11 @@ public class ReportDataServiceImpl implements ReportDataService{ return reportDataMapper.findInspectionTask(paramMap); } + @Override + public List> findInspectionTaskDetail(Map paramMap) { + return reportDataMapper.findInspectionTaskDetail(paramMap); + } + @Override public List> findResourceLoadRateInfo(Map paramMap) { return reportDataMapper.findResourceLoadRateInfo(paramMap); diff --git a/common/src/main/resources/mapper/ReportDataMapper.xml b/common/src/main/resources/mapper/ReportDataMapper.xml index 4bdc1ab6..1774454f 100644 --- a/common/src/main/resources/mapper/ReportDataMapper.xml +++ b/common/src/main/resources/mapper/ReportDataMapper.xml @@ -128,4 +128,12 @@ + \ No newline at end of file diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/dto/SfcDispatchEmployeeDto.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/dto/SfcDispatchEmployeeDto.java new file mode 100644 index 00000000..9b295d80 --- /dev/null +++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/dto/SfcDispatchEmployeeDto.java @@ -0,0 +1,34 @@ +package com.foreverwin.mesnac.dispatch.dto; + +import java.io.Serializable; + +public class SfcDispatchEmployeeDto implements Serializable { + + private String site; + private String sfcDispatchBo; + private String [] dispatchEmployee; + + public String getSite() { + return site; + } + + public void setSite(String site) { + this.site = site; + } + + public String getSfcDispatchBo() { + return sfcDispatchBo; + } + + public void setSfcDispatchBo(String sfcDispatchBo) { + this.sfcDispatchBo = sfcDispatchBo; + } + + public String[] getDispatchEmployee() { + return dispatchEmployee; + } + + public void setDispatchEmployee(String[] dispatchEmployee) { + this.dispatchEmployee = dispatchEmployee; + } +} diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/mapper/SfcDispatchEmployeeMapper.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/mapper/SfcDispatchEmployeeMapper.java new file mode 100644 index 00000000..d45bf42a --- /dev/null +++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/mapper/SfcDispatchEmployeeMapper.java @@ -0,0 +1,22 @@ +package com.foreverwin.mesnac.dispatch.mapper; + +import com.foreverwin.mesnac.dispatch.dto.SfcDispatchEmployeeDto; +import com.foreverwin.mesnac.dispatch.model.SfcDispatchEmployee; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.springframework.stereotype.Repository; + +import java.util.List; + +/** + *

+ * Mapper 接口 + *

+ * + * @author Leon.L + * @since 2021-09-02 + */ +@Repository +public interface SfcDispatchEmployeeMapper extends BaseMapper { + + void deleteSfcDispatchEmployee(List list); +} \ No newline at end of file diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/model/SfcDispatchEmployee.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/model/SfcDispatchEmployee.java new file mode 100644 index 00000000..bbcd14d5 --- /dev/null +++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/model/SfcDispatchEmployee.java @@ -0,0 +1,119 @@ +package com.foreverwin.mesnac.dispatch.model; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.baomidou.mybatisplus.annotation.TableId; +import java.time.LocalDateTime; +import com.baomidou.mybatisplus.annotation.TableField; +import java.io.Serializable; +import com.baomidou.mybatisplus.annotation.IdType; + +/** + *

+ * + *

+ * + * @author Leon.L + * @since 2021-09-02 + */ + +@TableName("Z_SFC_DISPATCH_EMPLOYEE") + +public class SfcDispatchEmployee extends Model { + + private static final long serialVersionUID = 1L; + + @TableId(value = "HANDLE", type = IdType.INPUT) + private String handle; + @TableField("SITE") + private String site; + @TableField("SFC_DISPATCH_BO") + private String sfcDispatchBo; + @TableField("EMPLOYEE") + private String employee; + @TableField("CREATE_USER") + private String createUser; + @TableField("CREATED_DATE_TIME") + private LocalDateTime createdDateTime; + + + public String getHandle() { + return handle; + } + + public void setHandle(String handle) { + this.handle = handle; + } + + public String getSite() { + return site; + } + + public void setSite(String site) { + this.site = site; + } + + public String getSfcDispatchBo() { + return sfcDispatchBo; + } + + public void setSfcDispatchBo(String sfcDispatchBo) { + this.sfcDispatchBo = sfcDispatchBo; + } + + public String getEmployee() { + return employee; + } + + public void setEmployee(String employee) { + this.employee = employee; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public LocalDateTime getCreatedDateTime() { + return createdDateTime; + } + + public void setCreatedDateTime(LocalDateTime createdDateTime) { + this.createdDateTime = createdDateTime; + } + +public static final String HANDLE = "HANDLE"; + +public static final String SITE = "SITE"; + +public static final String SFC_DISPATCH_BO = "SFC_DISPATCH_BO"; + +public static final String EMPLOYEE = "EMPLOYEE"; + +public static final String CREATE_USER = "CREATE_USER"; + +public static final String CREATED_DATE_TIME = "CREATED_DATE_TIME"; + + + @Override + protected Serializable pkVal() { + return this.handle; + } + + @Override + public String toString() { + return "SfcDispatchEmployee{" + + "handle = " + handle + + ", site = " + site + + ", sfcDispatchBo = " + sfcDispatchBo + + ", employee = " + employee + + ", createUser = " + createUser + + ", createdDateTime = " + createdDateTime + + "}"; + } +} \ No newline at end of file diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/SfcDispatchEmployeeService.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/SfcDispatchEmployeeService.java new file mode 100644 index 00000000..52ff3677 --- /dev/null +++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/SfcDispatchEmployeeService.java @@ -0,0 +1,20 @@ +package com.foreverwin.mesnac.dispatch.service; + +import com.foreverwin.mesnac.dispatch.dto.SfcDispatchEmployeeDto; +import com.foreverwin.mesnac.dispatch.model.SfcDispatchEmployee; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.List; + +/** + *

+ * 服务类 + *

+ * + * @author Leon.L + * @since 2021-09-02 + */ +public interface SfcDispatchEmployeeService extends IService { + + void saveSfcDispatchEmployee(List sfcDispatchEmployeeList); +} \ No newline at end of file diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SfcDispatchEmployeeServiceImpl.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SfcDispatchEmployeeServiceImpl.java new file mode 100644 index 00000000..1779a45f --- /dev/null +++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SfcDispatchEmployeeServiceImpl.java @@ -0,0 +1,70 @@ +package com.foreverwin.mesnac.dispatch.service.impl; + +import com.foreverwin.mesnac.dispatch.dto.SfcDispatchEmployeeDto; +import com.foreverwin.modular.core.util.CommonMethods; +import com.foreverwin.mesnac.dispatch.model.SfcDispatchEmployee; +import com.foreverwin.mesnac.dispatch.mapper.SfcDispatchEmployeeMapper; +import com.foreverwin.mesnac.dispatch.service.SfcDispatchEmployeeService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.transaction.annotation.Transactional; + +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + +/** + *

+ * 服务实现类 + *

+ * + * @author Leon.L + * @since 2021-09-02 + */ +@Service +@Transactional(rollbackFor = Exception.class) +public class SfcDispatchEmployeeServiceImpl extends ServiceImpl implements SfcDispatchEmployeeService { + + + @Autowired + private SfcDispatchEmployeeMapper sfcDispatchEmployeeMapper; + + @Override + public void saveSfcDispatchEmployee(List sfcDispatchEmployeeList) { + if (sfcDispatchEmployeeList == null || sfcDispatchEmployeeList.size() <= 0) { + return; + } + + String user = CommonMethods.getUser(); + LocalDateTime nowDate = LocalDateTime.now(); + List list = new ArrayList<>(); + for (int i = 0; i < sfcDispatchEmployeeList.size(); i++) { + SfcDispatchEmployeeDto disDto = sfcDispatchEmployeeList.get(i); + String [] array = disDto.getDispatchEmployee(); + if (array == null || array.length <= 0) { + continue; + } + + for (int j = 0; j < array.length; j++) { + SfcDispatchEmployee sfcDispatchEmployee = new SfcDispatchEmployee(); + sfcDispatchEmployee.setHandle(UUID.randomUUID().toString()); + sfcDispatchEmployee.setSite(disDto.getSite()); + sfcDispatchEmployee.setSfcDispatchBo(disDto.getSfcDispatchBo()); + sfcDispatchEmployee.setEmployee(array[j]); + sfcDispatchEmployee.setCreateUser(user); + sfcDispatchEmployee.setCreatedDateTime(nowDate); + list.add(sfcDispatchEmployee); + } + } + + //删除派工人员 + sfcDispatchEmployeeMapper.deleteSfcDispatchEmployee(sfcDispatchEmployeeList); + + //保存派工人员 + if (list != null && list.size() > 0) { + this.saveBatch(list); + } + } +} \ No newline at end of file diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SfcDispatchServiceImpl.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SfcDispatchServiceImpl.java index 57064170..93307088 100644 --- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SfcDispatchServiceImpl.java +++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SfcDispatchServiceImpl.java @@ -14,10 +14,12 @@ import com.foreverwin.mesnac.common.util.DateUtil; import com.foreverwin.mesnac.common.util.ExcelUtils; import com.foreverwin.mesnac.common.util.StringUtil; import com.foreverwin.mesnac.dispatch.dto.RouterDTO; +import com.foreverwin.mesnac.dispatch.dto.SfcDispatchEmployeeDto; import com.foreverwin.mesnac.dispatch.dto.WorkCenterWorkTimeDTO; import com.foreverwin.mesnac.dispatch.mapper.SfcDispatchMapper; import com.foreverwin.mesnac.dispatch.model.CallItem; import com.foreverwin.mesnac.dispatch.model.SfcDispatch; +import com.foreverwin.mesnac.dispatch.model.SfcDispatchEmployee; import com.foreverwin.mesnac.dispatch.model.UserResource; import com.foreverwin.mesnac.dispatch.service.*; import com.foreverwin.mesnac.meapi.dto.WorkCenterLinkDTO; @@ -83,6 +85,8 @@ public class SfcDispatchServiceImpl extends ServiceImpl findSfcDispatch(String site, String sfc, String operation, String stepId) { @@ -387,6 +391,7 @@ public class SfcDispatchServiceImpl extends ServiceImpl sfcDispatchEmployeeList = new ArrayList<>(); //状态标识，表示本次派工成功或是失败 Boolean flag = true; LocalDateTime nowDate = LocalDateTime.now(); @@ -400,6 +405,8 @@ public class SfcDispatchServiceImpl extends ServiceImpl disMap = new HashMap<>(); //派工导入 if (DispatchStatusEnum.IMPORT.getCode().equals(type)) { String handle = HandleEnum.SFC_DISPATCH.getHandle(site, dispatchNo); @@ -432,7 +439,7 @@ public class SfcDispatchServiceImpl extends ServiceImpl _list = userMap.get(_employeeDescription); @@ -546,7 +553,7 @@ public class SfcDispatchServiceImpl extends ServiceImpl 0) { + SfcDispatchEmployeeDto sfcDispatchEmployee = new SfcDispatchEmployeeDto(); + sfcDispatchEmployee.setSite(site); + sfcDispatchEmployee.setSfcDispatchBo(sfcDispatchDto.getHandle()); + sfcDispatchEmployee.setDispatchEmployee(employeeArray); + sfcDispatchEmployeeList.add(sfcDispatchEmployee); + } } //执行更新 @@ -601,6 +617,9 @@ public class SfcDispatchServiceImpl extends ServiceImpl + + + + + + + + + + + + + + + + HANDLE, SITE, SFC_DISPATCH_BO, EMPLOYEE, CREATE_USER, CREATED_DATE_TIME + + + + + + + + + + + + + + + + + + + + + + + + + INSERT INTO Z_SFC_DISPATCH_EMPLOYEE + + HANDLE, + SITE, + SFC_DISPATCH_BO, + EMPLOYEE, + CREATE_USER, + CREATED_DATE_TIME, + VALUES + + #{handle}, + #{site}, + #{sfcDispatchBo}, + #{employee}, + #{createUser}, + #{createdDateTime}, + + + + + INSERT INTO Z_SFC_DISPATCH_EMPLOYEE + + + VALUES + + #{handle}, + #{site}, + #{sfcDispatchBo}, + #{employee}, + #{createUser}, + #{createdDateTime}, + + + + + + UPDATE Z_SFC_DISPATCH_EMPLOYEE + SITE=#{et.site}, + SFC_DISPATCH_BO=#{et.sfcDispatchBo}, + EMPLOYEE=#{et.employee}, + CREATE_USER=#{et.createUser}, + CREATED_DATE_TIME=#{et.createdDateTime}, + WHERE HANDLE=#{et.handle} and ${et.MP_OPTLOCK_VERSION_COLUMN}=#{et.MP_OPTLOCK_VERSION_ORIGINAL} + + + + + UPDATE Z_SFC_DISPATCH_EMPLOYEE + SITE=#{et.site}, + SFC_DISPATCH_BO=#{et.sfcDispatchBo}, + EMPLOYEE=#{et.employee}, + CREATE_USER=#{et.createUser}, + CREATED_DATE_TIME=#{et.createdDateTime}, + WHERE HANDLE=#{et.handle} and ${et.MP_OPTLOCK_VERSION_COLUMN}=#{et.MP_OPTLOCK_VERSION_ORIGINAL} + + + + + UPDATE Z_SFC_DISPATCH_EMPLOYEE + SITE=#{et.site}, + SFC_DISPATCH_BO=#{et.sfcDispatchBo}, + EMPLOYEE=#{et.employee}, + CREATE_USER=#{et.createUser}, + CREATED_DATE_TIME=#{et.createdDateTime}, + + + + + HANDLE=#{ew.entity.handle} + AND SITE=#{ew.entity.site} + AND SFC_DISPATCH_BO=#{ew.entity.sfcDispatchBo} + AND EMPLOYEE=#{ew.entity.employee} + AND CREATE_USER=#{ew.entity.createUser} + AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} + + + ${ew.sqlSegment} + + + + + ${ew.sqlSegment} + + + + + DELETE FROM Z_SFC_DISPATCH_EMPLOYEE WHERE HANDLE=#{handle} + + + + DELETE FROM Z_SFC_DISPATCH_EMPLOYEE + + + + + ${k} = #{cm[${k}]} + + + + + + + + DELETE FROM Z_SFC_DISPATCH_EMPLOYEE + + + + + HANDLE=#{ew.entity.handle} + + AND SITE=#{ew.entity.site} + AND SFC_DISPATCH_BO=#{ew.entity.sfcDispatchBo} + AND EMPLOYEE=#{ew.entity.employee} + AND CREATE_USER=#{ew.entity.createUser} + AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} + + + ${ew.sqlSegment} + + + + + ${ew.sqlSegment} + + + + + DELETE FROM Z_SFC_DISPATCH_EMPLOYEE WHERE HANDLE IN ( + #{item} + ) + + + + + DELETE FROM Z_SFC_DISPATCH_EMPLOYEE + WHERE SFC_DISPATCH_BO IN + + #{item.sfcDispatchBo} + + + diff --git a/generator/src/main/java/com/foreverwin/minth/generator/GeneratorApplication.java b/generator/src/main/java/com/foreverwin/minth/generator/GeneratorApplication.java index 5c2144dd..c3bd4efa 100644 --- a/generator/src/main/java/com/foreverwin/minth/generator/GeneratorApplication.java +++ b/generator/src/main/java/com/foreverwin/minth/generator/GeneratorApplication.java @@ -31,9 +31,9 @@ public class GeneratorApplication { dataSourceConfig.setTypeConvert( new OracleTypeConvert() ); MpGenerator mpGenerator = mpGeneratorBuilder.dataSourceConfig(dataSourceConfig) .tablePrefix( "APS_", "DS_", "Z_" ) - .packageName( "com.foreverwin.mesnac.production" ) - .tables("Z_CUTTER_LOG") - .author("Philip") + .packageName( "com.foreverwin.mesnac.dispatch" ) + .tables("Z_SFC_DISPATCH_EMPLOYEE") + .author("Leon.L") .uiAppId("com.foreverwin.me") .uiPackage("com.foreverwin.me.production") .build(); From cf24e0177566d05d99aa7ccf93defcc0552629a9 Mon Sep 17 00:00:00 2001 From: Leon <3066758958@qq.com> Date: Thu, 2 Sep 2021 17:54:37 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E6=B4=BE=E5=B7=A5?= =?UTF-8?q?=E4=BA=BA=E5=91=98=E5=8D=95=E7=8B=AC=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/src/main/resources/mapper/ReportDataMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/src/main/resources/mapper/ReportDataMapper.xml b/common/src/main/resources/mapper/ReportDataMapper.xml index 1774454f..f8ef1c2f 100644 --- a/common/src/main/resources/mapper/ReportDataMapper.xml +++ b/common/src/main/resources/mapper/ReportDataMapper.xml @@ -129,11 +129,11 @@ \ No newline at end of file