Yangwl
/
mesnac_mes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
赵嘉伟 4 years ago
parent d6d16737c8 bb17f7e1ab
commit 4ee60c5baa
66 changed files with 3323 additions and 447 deletions
Show Stats Download Patch File Download Diff File

9
common/src/main/java/com/foreverwin/mesnac/common/constant/CustomFieldConstant.java
Unescape Escape View File

@ -44,5 +44,14 @@ public class CustomFieldConstant {
public static final String SFC_DATA_LOCATION = "LOCATION";
//**************************************************************************************
public static final String ITEM_ACCESSORY_TYPE = "ACCESSORY_TYPE";
public static final String ITEM_WEIGHT = "MAT_WEIGHT";
public static final String ITEM_MAT_SPEC = "MAT_SPEC";
public static final String ITEM_MODEL = "MODEL";
public static final String ITEM_TEXTURE = "TEXTURE";
public static final String ITEM_DRAWING = "DRAWING";
public static final String ITEM_DRAWING_REVISION = "DRAWING_REVISION";
}

1
common/src/main/java/com/foreverwin/mesnac/common/constant/IntegrationTypeConstant.java
Unescape Escape View File

@ -12,6 +12,7 @@ public class IntegrationTypeConstant {
public static final String ITEM = "ITEM";
public static final String BOM = "BOM";
public static final String ROUTER = "ROUTER";
public static final String DIS_ROUTER = "DIS_ROUTER";
public static final String SHOP_ORDER = "SHOP_ORDER";
public static final String ITEM_BATCH_RECEIVE = "ITEM_BATCH_RECEIVE";
}

136
common/src/main/java/com/foreverwin/mesnac/common/controller/PrintLogController.java
Unescape Escape View File

@ -0,0 +1,136 @@
package com.foreverwin.mesnac.common.controller;
import com.foreverwin.modular.core.util.R;
import com.foreverwin.modular.core.util.FrontPage;
import com.foreverwin.modular.core.util.CommonMethods;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import com.foreverwin.mesnac.common.service.PrintLogService;
import com.foreverwin.mesnac.common.model.PrintLog;
import java.util.List;
/**
*
* @author Philip
* @since 2021-07-16
*/
@RestController
@RequestMapping("/Z-PRINT-LOG")
public class PrintLogController {
@Autowired
public PrintLogService printLogService;
/**
* 根据id查询
*
* @param id 主键
* @return
*/
@ResponseBody
@GetMapping("/{id:.+}")
public R getPrintLogById(@PathVariable String id) {
return R.ok( printLogService.getById(id));
}
/**
* 查询所有数据
*
* @return
*/
@ResponseBody
@GetMapping("")
public R getPrintLogList(PrintLog printLog){
List<PrintLog> result;
QueryWrapper<PrintLog> queryWrapper = new QueryWrapper<>();
queryWrapper.setEntity(printLog);
result = printLogService.list(queryWrapper);
return R.ok(result);
}
/**
* 分页查询数据
*
* @param frontPage 分页信息
* @return
*/
@ResponseBody
@GetMapping("/page")
public R page(FrontPage<PrintLog> frontPage, PrintLog printLog){
IPage result;
QueryWrapper<PrintLog> queryWrapper = new QueryWrapper<>();
queryWrapper.setEntity(printLog);
if (frontPage.getGlobalQuery() != null && !"".equals(frontPage.getGlobalQuery().trim())) {
//TODO modify global query
queryWrapper.lambda().and(wrapper -> wrapper
.like(PrintLog::getHandle, frontPage.getGlobalQuery())
.or().like(PrintLog::getSite, frontPage.getGlobalQuery())
.or().like(PrintLog::getCategory, frontPage.getGlobalQuery())
.or().like(PrintLog::getPrintName, frontPage.getGlobalQuery())
.or().like(PrintLog::getPrintTemplate, frontPage.getGlobalQuery())
.or().like(PrintLog::getPrintParam, frontPage.getGlobalQuery())
.or().like(PrintLog::getSfc, frontPage.getGlobalQuery())
.or().like(PrintLog::getResrce, frontPage.getGlobalQuery())
.or().like(PrintLog::getStepId, frontPage.getGlobalQuery())
.or().like(PrintLog::getOperation, frontPage.getGlobalQuery())
.or().like(PrintLog::getInventory, frontPage.getGlobalQuery())
.or().like(PrintLog::getComments, frontPage.getGlobalQuery())
.or().like(PrintLog::getOther1, frontPage.getGlobalQuery())
.or().like(PrintLog::getOther2, frontPage.getGlobalQuery())
.or().like(PrintLog::getOther3, frontPage.getGlobalQuery())
.or().like(PrintLog::getOther4, frontPage.getGlobalQuery())
.or().like(PrintLog::getOther5, frontPage.getGlobalQuery())
.or().like(PrintLog::getCreateUser, frontPage.getGlobalQuery())
.or().like(PrintLog::getModifyUser, frontPage.getGlobalQuery())
);
}
result = printLogService.page(frontPage.getPagePlus(), queryWrapper);
return R.ok(result);
}
/**
* 新增
* @param printLog 传递的实体
* @return null 失败 实体成功
*/
@PostMapping
public R save(@RequestBody PrintLog printLog) {
return R.ok(printLogService.save(printLog));
}
/**
* 修改
* @param printLog 传递的实体
* @return null 失败 实体成功
*/
@PutMapping
public R updateById(@RequestBody PrintLog printLog) {
return R.ok(printLogService.updateById(printLog));
}
/**
* 根据id删除对象
* @param id 实体ID
* @return 0 失败 1 成功
*/
@ResponseBody
@RequestMapping(method = RequestMethod.DELETE, value = "/{id:.+}")
public R removeById(@PathVariable("id") String id){
return R.ok(printLogService.removeById(id));
}
/**
* 批量删除对象
* @param ids 实体集合ID
* @return 0 失败 1 成功
*/
@ResponseBody
@RequestMapping(method = RequestMethod.POST, value = "/delete-batch")
public R removeByIds(List<String> ids){
return R.ok(printLogService.removeByIds(ids));
}
}

15
production/src/main/java/com/foreverwin/mesnac/production/controller/ToolController.java → common/src/main/java/com/foreverwin/mesnac/common/controller/ToolController.java
Unescape Escape View File

@ -1,18 +1,15 @@
package com.foreverwin.mesnac.production.controller;
package com.foreverwin.mesnac.common.controller;
import com.foreverwin.mesnac.common.enums.HandleEnum;
import com.foreverwin.modular.core.util.R;
import com.foreverwin.modular.core.util.FrontPage;
import com.foreverwin.modular.core.util.CommonMethods;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import oracle.jdbc.proxy.annotation.Post;
import org.springframework.web.bind.annotation.RequestMapping;
import com.foreverwin.mesnac.common.model.Tool;
import com.foreverwin.mesnac.common.service.ToolService;
import com.foreverwin.modular.core.util.CommonMethods;
import com.foreverwin.modular.core.util.FrontPage;
import com.foreverwin.modular.core.util.R;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import com.foreverwin.mesnac.production.service.ToolService;
import com.foreverwin.mesnac.production.model.Tool;
import java.util.List;
/**

12
common/src/main/java/com/foreverwin/mesnac/common/dto/SfcDispatchDto.java
Unescape Escape View File

@ -162,6 +162,10 @@ public class SfcDispatchDto implements Serializable{
* 工单自定义字段-工作令号
*/
private String workOrder;
/**
* 工单自定义字段-项目号
*/
private String itemNumber;
/**
* 工单组件信息
*/
@ -532,6 +536,14 @@ public class SfcDispatchDto implements Serializable{
this.workOrder = workOrder;
}
public String getItemNumber() {
return itemNumber;
}
public void setItemNumber(String itemNumber) {
this.itemNumber = itemNumber;
}
public String getComponent() {
return component;
}

43
common/src/main/java/com/foreverwin/mesnac/common/enums/InspectionTypeEnum.java
Unescape Escape View File

@ -0,0 +1,43 @@
package com.foreverwin.mesnac.common.enums;
public enum InspectionTypeEnum {
S("首件检验","S"),
H("互检检验","H"),
Z("自检检验","Z"),
P("专检检验","P"),
EM("日常保养","EM"),
OM("一级保养","OM"),
SM("二级保养","SM"),
DM("日点检","DM"),
WM("周点检","WM"),
MM("月点检","MM"),
YM("年点检","YM"),
T("文本","T"),
N("数字","N"),
B("布尔","B");
private String code;
private String value;
InspectionTypeEnum(String code,String value) {
this.code = code;
this.value = value;
}
public String getCode() {
return code;
}
public String getValue() {
return value;
}
public static String getValue(String code) {
for (InspectionTypeEnum ele : values()) {
if(ele.getCode().equals(code)) return ele.getValue();
}
return null;
}
}

2
common/src/main/java/com/foreverwin/mesnac/common/mapper/InspectionItemMapper.java
Unescape Escape View File

@ -23,5 +23,5 @@ public interface InspectionItemMapper extends BaseMapper<InspectionItem> {
List<InspectionItemDetail> selectWidestQualityInspection(@Param("site")String site,@Param("inspectionType")String inspectionType,@Param("additionalObject")String additionalObject);
Integer checkRouterStep(@Param("site")String site,@Param("operation") String operation,@Param("step") String step);
Integer checkRouterStep(@Param("site")String site,@Param("operation") String operation,@Param("stepId") String stepId);
}

18
common/src/main/java/com/foreverwin/mesnac/common/mapper/PrintLogMapper.java
Unescape Escape View File

@ -0,0 +1,18 @@
package com.foreverwin.mesnac.common.mapper;
import com.foreverwin.mesnac.common.model.PrintLog;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.springframework.stereotype.Repository;
/**
* <p>
* Mapper 接口
* </p>
*
* @author Philip
* @since 2021-07-16
*/
@Repository
public interface PrintLogMapper extends BaseMapper<PrintLog> {
}

4
production/src/main/java/com/foreverwin/mesnac/production/mapper/ToolMapper.java → common/src/main/java/com/foreverwin/mesnac/common/mapper/ToolMapper.java
Unescape Escape View File

@ -1,7 +1,7 @@
package com.foreverwin.mesnac.production.mapper;
package com.foreverwin.mesnac.common.mapper;
import com.foreverwin.mesnac.production.model.Tool;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.foreverwin.mesnac.common.model.Tool;
import org.springframework.stereotype.Repository;
/**

23
common/src/main/java/com/foreverwin/mesnac/common/model/InspectionItemDetail.java
Unescape Escape View File

@ -1,13 +1,14 @@
package com.foreverwin.mesnac.common.model;
import java.io.Serializable;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.baomidou.mybatisplus.annotation.TableId;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.IdType;
/**
* <p>
@ -73,7 +74,7 @@ public class InspectionItemDetail extends Model<InspectionItemDetail> {
* 最小值
*/
@TableField("MIN_VALUE")
private Double minValue;
private BigDecimal minValue;
/**
* 标准值
*/
@ -83,7 +84,7 @@ public class InspectionItemDetail extends Model<InspectionItemDetail> {
* 最大值
*/
@TableField("MAX_VALUE")
private Double maxValue;
private BigDecimal maxValue;
/**
* FALSE值
*/
@ -198,11 +199,11 @@ public class InspectionItemDetail extends Model<InspectionItemDetail> {
this.decimalNum = decimalNum;
}
public Double getMinValue() {
public BigDecimal getMinValue() {
return minValue;
}
public void setMinValue(Double minValue) {
public void setMinValue(BigDecimal minValue) {
this.minValue = minValue;
}
@ -214,11 +215,11 @@ public class InspectionItemDetail extends Model<InspectionItemDetail> {
this.standardValue = standardValue;
}
public Double getMaxValue() {
public BigDecimal getMaxValue() {
return maxValue;
}
public void setMaxValue(Double maxValue) {
public void setMaxValue(BigDecimal maxValue) {
this.maxValue = maxValue;
}

358
common/src/main/java/com/foreverwin/mesnac/common/model/PrintLog.java
Unescape Escape View File

@ -0,0 +1,358 @@
package com.foreverwin.mesnac.common.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;
/**
* <p>
*
* </p>
*
* @author Philip
* @since 2021-07-16
*/
@TableName("Z_PRINT_LOG")
public class PrintLog extends Model<PrintLog> {
private static final long serialVersionUID = 1L;
/**
* 主键
*/
@TableId(value = "HANDLE", type = IdType.INPUT)
private String handle;
/**
* 站点
*/
@TableField("SITE")
private String site;
/**
* 打印类别
*/
@TableField("CATEGORY")
private String category;
/**
* 打印机
*/
@TableField("PRINT_NAME")
private String printName;
/**
* 打印模板
*/
@TableField("PRINT_TEMPLATE")
private String printTemplate;
/**
* 打印参数
*/
@TableField("PRINT_PARAM")
private String printParam;
/**
* 生产批次
*/
@TableField("SFC")
private String sfc;
/**
* 资源编号
*/
@TableField("RESRCE")
private String resrce;
/**
* 步骤标识
*/
@TableField("STEP_ID")
private String stepId;
/**
* 工序编号
*/
@TableField("OPERATION")
private String operation;
/**
* 库存批次
*/
@TableField("INVENTORY")
private String inventory;
@TableField("COMMENTS")
private String comments;
@TableField("OTHER_1")
private String other1;
@TableField("OTHER_2")
private String other2;
@TableField("OTHER_3")
private String other3;
@TableField("OTHER_4")
private String other4;
@TableField("OTHER_5")
private String other5;
/**
* 创建人
*/
@TableField("CREATE_USER")
private String createUser;
/**
* 创建时间
*/
@TableField("CREATED_DATE_TIME")
private LocalDateTime createdDateTime;
/**
* 修改人
*/
@TableField("MODIFY_USER")
private String modifyUser;
/**
* 修改时间
*/
@TableField("MODIFIED_DATE_TIME")
private LocalDateTime modifiedDateTime;
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 getCategory() {
return category;
}
public void setCategory(String category) {
this.category = category;
}
public String getPrintName() {
return printName;
}
public void setPrintName(String printName) {
this.printName = printName;
}
public String getPrintTemplate() {
return printTemplate;
}
public void setPrintTemplate(String printTemplate) {
this.printTemplate = printTemplate;
}
public String getPrintParam() {
return printParam;
}
public void setPrintParam(String printParam) {
this.printParam = printParam;
}
public String getSfc() {
return sfc;
}
public void setSfc(String sfc) {
this.sfc = sfc;
}
public String getResrce() {
return resrce;
}
public void setResrce(String resrce) {
this.resrce = resrce;
}
public String getStepId() {
return stepId;
}
public void setStepId(String stepId) {
this.stepId = stepId;
}
public String getOperation() {
return operation;
}
public void setOperation(String operation) {
this.operation = operation;
}
public String getInventory() {
return inventory;
}
public void setInventory(String inventory) {
this.inventory = inventory;
}
public String getComments() {
return comments;
}
public void setComments(String comments) {
this.comments = comments;
}
public String getOther1() {
return other1;
}
public void setOther1(String other1) {
this.other1 = other1;
}
public String getOther2() {
return other2;
}
public void setOther2(String other2) {
this.other2 = other2;
}
public String getOther3() {
return other3;
}
public void setOther3(String other3) {
this.other3 = other3;
}
public String getOther4() {
return other4;
}
public void setOther4(String other4) {
this.other4 = other4;
}
public String getOther5() {
return other5;
}
public void setOther5(String other5) {
this.other5 = other5;
}
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 String getModifyUser() {
return modifyUser;
}
public void setModifyUser(String modifyUser) {
this.modifyUser = modifyUser;
}
public LocalDateTime getModifiedDateTime() {
return modifiedDateTime;
}
public void setModifiedDateTime(LocalDateTime modifiedDateTime) {
this.modifiedDateTime = modifiedDateTime;
}
public static final String HANDLE = "HANDLE";
public static final String SITE = "SITE";
public static final String CATEGORY = "CATEGORY";
public static final String PRINT_NAME = "PRINT_NAME";
public static final String PRINT_TEMPLATE = "PRINT_TEMPLATE";
public static final String PRINT_PARAM = "PRINT_PARAM";
public static final String SFC = "SFC";
public static final String RESRCE = "RESRCE";
public static final String STEP_ID = "STEP_ID";
public static final String OPERATION = "OPERATION";
public static final String INVENTORY = "INVENTORY";
public static final String COMMENTS = "COMMENTS";
public static final String OTHER_1 = "OTHER_1";
public static final String OTHER_2 = "OTHER_2";
public static final String OTHER_3 = "OTHER_3";
public static final String OTHER_4 = "OTHER_4";
public static final String OTHER_5 = "OTHER_5";
public static final String CREATE_USER = "CREATE_USER";
public static final String CREATED_DATE_TIME = "CREATED_DATE_TIME";
public static final String MODIFY_USER = "MODIFY_USER";
public static final String MODIFIED_DATE_TIME = "MODIFIED_DATE_TIME";
@Override
protected Serializable pkVal() {
return this.handle;
}
@Override
public String toString() {
return "PrintLog{" +
"handle = " + handle +
", site = " + site +
", category = " + category +
", printName = " + printName +
", printTemplate = " + printTemplate +
", printParam = " + printParam +
", sfc = " + sfc +
", resrce = " + resrce +
", stepId = " + stepId +
", operation = " + operation +
", inventory = " + inventory +
", comments = " + comments +
", other1 = " + other1 +
", other2 = " + other2 +
", other3 = " + other3 +
", other4 = " + other4 +
", other5 = " + other5 +
", createUser = " + createUser +
", createdDateTime = " + createdDateTime +
", modifyUser = " + modifyUser +
", modifiedDateTime = " + modifiedDateTime +
"}";
}
}

52
common/src/main/java/com/foreverwin/mesnac/common/model/PrintRequest.java
Unescape Escape View File

@ -0,0 +1,52 @@
package com.foreverwin.mesnac.common.model;
import java.io.Serializable;
import java.util.Map;
/**
* 打印参数实体类
*
*/
public class PrintRequest implements Serializable {
//打印数量
private int labelQty;
//打印机
private String printer;
//打印模板
private String template;
//打印参数
private Map<String, Object> paramMap;
public int getLabelQty() {
return labelQty;
}
public void setLabelQty(int labelQty) {
this.labelQty = labelQty;
}
public String getPrinter() {
return printer;
}
public void setPrinter(String printer) {
this.printer = printer;
}
public String getTemplate() {
return template;
}
public void setTemplate(String template) {
this.template = template;
}
public Map<String, Object> getParamMap() {
return paramMap;
}
public void setParamMap(Map<String, Object> paramMap) {
this.paramMap = paramMap;
}
}

13
production/src/main/java/com/foreverwin/mesnac/production/model/Tool.java → common/src/main/java/com/foreverwin/mesnac/common/model/Tool.java
Unescape Escape View File

@ -1,14 +1,13 @@
package com.foreverwin.mesnac.production.model;
import java.io.Serializable;
package com.foreverwin.mesnac.common.model;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
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;
import java.time.LocalDateTime;
/**
* <p>

3
common/src/main/java/com/foreverwin/mesnac/common/service/InspectionItemService.java
Unescape Escape View File

@ -1,5 +1,6 @@
package com.foreverwin.mesnac.common.service;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.foreverwin.mesnac.common.model.InspectionItem;
import com.baomidou.mybatisplus.extension.service.IService;
@ -37,4 +38,6 @@ public interface InspectionItemService extends IService<InspectionItem> {
//是否存在质量检验项目
List<InspectionItemDetail> selectQualityInspection(String sfc, String operation, String stepId, String inspectionType);
void insert(JSONObject jsonObject);
}

22
common/src/main/java/com/foreverwin/mesnac/common/service/PrintLogService.java
Unescape Escape View File

@ -0,0 +1,22 @@
package com.foreverwin.mesnac.common.service;
import com.foreverwin.mesnac.common.model.PrintLog;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
* 服务类
* </p>
*
* @author Philip
* @since 2021-07-16
*/
public interface PrintLogService extends IService<PrintLog> {
/**
* 记录打印日志
*
* @param printLog
*/
void savePrintLog(String site, String user, PrintLog printLog);
}

13
common/src/main/java/com/foreverwin/mesnac/common/service/PrintService.java
Unescape Escape View File

@ -0,0 +1,13 @@
package com.foreverwin.mesnac.common.service;
import com.foreverwin.mesnac.common.model.PrintRequest;
/**
* @author Ervin Chen
* @date 2020/3/6 13:37
*/
public interface PrintService {
void print(PrintRequest printRequest);
}

17
production/src/main/java/com/foreverwin/mesnac/production/service/ToolService.java → common/src/main/java/com/foreverwin/mesnac/common/service/ToolService.java
Unescape Escape View File

@ -1,8 +1,9 @@
package com.foreverwin.mesnac.production.service;
package com.foreverwin.mesnac.common.service;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.foreverwin.mesnac.production.model.Tool;
import com.baomidou.mybatisplus.extension.service.IService;
import com.foreverwin.mesnac.common.model.Tool;
import com.foreverwin.modular.core.util.FrontPage;
import java.util.List;
@ -45,4 +46,16 @@ public interface ToolService extends IService<Tool> {
*/
void deleteInspectionPlanByHandle(String tool);
/**
* 插入或更新导入的刀具数据
* sqlType：
* 1、update
* 2、insert
* 3、both
* @param jsonObject
* @param sqlType
*/
String saveOrUpdateToolByImport(JSONObject jsonObject, String sqlType);
}

217
common/src/main/java/com/foreverwin/mesnac/common/service/impl/InspectionItemServiceImpl.java
Unescape Escape View File

@ -1,5 +1,6 @@
package com.foreverwin.mesnac.common.service.impl;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@ -7,6 +8,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.foreverwin.mesnac.common.constant.Constants;
import com.foreverwin.mesnac.common.enums.HandleEnum;
import com.foreverwin.mesnac.common.enums.InspectionTypeEnum;
import com.foreverwin.mesnac.common.mapper.InspectionItemMapper;
import com.foreverwin.mesnac.common.model.InspectionItem;
import com.foreverwin.mesnac.common.model.InspectionItemAddition;
@ -16,16 +18,19 @@ import com.foreverwin.mesnac.common.service.InspectionItemDetailService;
import com.foreverwin.mesnac.common.service.InspectionItemService;
import com.foreverwin.mesnac.common.util.StringUtil;
import com.foreverwin.mesnac.meapi.model.Item;
import com.foreverwin.mesnac.meapi.model.Operation;
import com.foreverwin.mesnac.meapi.model.ResourceType;
import com.foreverwin.mesnac.meapi.service.ItemService;
import com.foreverwin.mesnac.meapi.service.OperationService;
import com.foreverwin.mesnac.meapi.service.ResourceTypeService;
import com.foreverwin.modular.core.exception.BaseException;
import com.foreverwin.modular.core.util.CommonMethods;
import com.foreverwin.modular.core.util.FrontPage;
import com.visiprise.common.exception.BaseException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.HashMap;
import java.util.List;
@ -46,6 +51,8 @@ public class InspectionItemServiceImpl extends ServiceImpl<InspectionItemMapper,
@Autowired
private ItemService itemService;
@Autowired
private OperationService operationService;
@Autowired
private ResourceTypeService resourceTypeService;
@Autowired
private InspectionItemMapper inspectionItemMapper;
@ -95,6 +102,9 @@ public class InspectionItemServiceImpl extends ServiceImpl<InspectionItemMapper,
public void saveAll(InspectionItem inspectionItem) {
String site = CommonMethods.getSite();
boolean b = false;
if(StringUtil.isEmpty(inspectionItem.getInspectionItemNo())&&inspectionItem.getInspectionItemAdditionList()==null){
throw new BaseException("检验项目编号不能为空");
}
if (StringUtil.isEmpty(inspectionItem.getInspectionItemNo())) {
b = true;
inspectionItem.setInspectionItemNo(inspectItemNoGenerationRules(inspectionItem));
@ -229,5 +239,210 @@ public class InspectionItemServiceImpl extends ServiceImpl<InspectionItemMapper,
return inspectionItemDetails;
}
@Override
public void insert(JSONObject jsonObject) {
String user = CommonMethods.getUser();
LocalDateTime now = LocalDateTime.now();
String description = jsonObject.getString("description");
String site = jsonObject.getString("site");
String inspectionType = jsonObject.getString("inspectionType");
inspectionType = InspectionTypeEnum.getValue(inspectionType);
if (inspectionType==null){
throw new BaseException("不存在的检验类型");
}
String inspectionItemNo = jsonObject.getString("inspectionItemNo");
if (StringUtil.isBlank(inspectionItemNo)){
throw new BaseException("检验项目编号不能为空");
}
String revision = jsonObject.getString("revision");
if (StringUtil.isBlank(revision)){
throw new BaseException("版本不能为空");
}
String item = jsonObject.getString("item");
String operation = jsonObject.getString("operation");
if (StringUtil.isBlank(operation)){
throw new BaseException("工序不能为空");
}
String resrceType = jsonObject.getString("resrceType");
String paramNo = jsonObject.getString("paramNo");
if (StringUtil.isBlank(paramNo)){
throw new BaseException("参数名称不能为空");
}
String paramDescription = jsonObject.getString("paramDescription");
String inspectionMethod = jsonObject.getString("inspectionMethod");
if (StringUtil.isBlank(inspectionMethod)){
throw new BaseException("检验方法不能为空");
}
String paramType = jsonObject.getString("paramType");
paramType = InspectionTypeEnum.getValue(paramType);
if (StringUtil.isBlank(paramType)){
throw new BaseException("不存在的参数类型");
}
String decimalNum = jsonObject.getString("decimalNum");
String paramUnit = jsonObject.getString("paramUnit");
String maxValue = jsonObject.getString("maxValue");
String standardValue = jsonObject.getString("standardValue");
String minValue = jsonObject.getString("minValue");
String falseValue = jsonObject.getString("falseValue");
String trueValue = jsonObject.getString("trueValue");
String isRequired = jsonObject.getString("isRequired");
if (StringUtil.isBlank(isRequired)){
throw new BaseException("是否重要项不能为空");
}
String checkNum = jsonObject.getString("checkNum");
String handle = HandleEnum.INSPECTION_ITEM.getHandle(site, inspectionItemNo, revision);
InspectionItem byId = getById(handle);
if (byId==null){
InspectionItem entity=new InspectionItem();
entity.setHandle(HandleEnum.INSPECTION_ITEM.getHandle(site,inspectionItemNo,revision));
entity.setSite(site);
entity.setInspectionItemNo(inspectionItemNo);
if (inspectionType.length() > 1) {
entity.setCategory("EQ");
} else {
entity.setCategory("QC");
}
entity.setInspectionType(inspectionType);
entity.setRevision(revision);
entity.setCurrentRevision(Constants.BOOL_TRUE);
entity.setDescription(description);
entity.setStatus(Constants.STATUS_Y);
entity.setCreateUser(user);
entity.setCreatedDateTime(now);
entity.setModifyUser(user);
entity.setModifiedDateTime(now);
entity.setCategory(user);
save(entity);
}
ResourceType selectResourceType = null;
Item currentItem = null;
Operation currentRevisionRef = null;
if (inspectionType.length() == 1) {
if (StringUtil.isBlank(item)){
throw new BaseException("物料不能为空");
}
if (StringUtil.isBlank(operation)){
throw new BaseException("工序不能为空");
}
if ( !item.equals("*")) {
currentItem = itemService.selectCurrent(CommonMethods.getSite(), item);
if (currentItem == null) {
throw new BaseException("物料[" + item + "]不存在");
}
}
if (!operation.equals("*")) {
String[] split = operation.split("/");
String op = split[0];
currentRevisionRef = operationService.getCurrentRevisionRef(site, op);
String step = split[1];
Integer integer = inspectionItemMapper.checkRouterStep(site, op, step);
if (integer < 1) {
throw new BaseException("工序/步骤[" + operation + "]不存在");
}
}
}else {
if (StringUtil.notBlank(resrceType)&&!resrceType.equals("*")) {
String resourceTypeHandle = HandleEnum.RESOURCE_TYPE.getHandle(site, resrceType);
selectResourceType = resourceTypeService.getById(resourceTypeHandle);
if (selectResourceType == null) {
throw new BaseException("设备类型[" + resrceType + "]不存在");
}
}
}
QueryWrapper queryWrapper=new QueryWrapper<InspectionItemAddition>();
queryWrapper.eq(InspectionItemAddition.INSPECTION_ITEM_BO,handle);
List<InspectionItemAddition> additionList = inspectionItemAdditionService.list(queryWrapper);
if (additionList.size()>0){
for (InspectionItemAddition inspectionItemAddition : additionList) {
if (inspectionItemAddition.getAdditionalObjectType().equals(Constants.ADDITIONAL_OBJECT_TYPE_ITEM)&&!inspectionItemAddition.getAdditionalObject().equals(item)){
throw new BaseException("检验项目中物料[" + item + "]不相同");
}
if (inspectionItemAddition.getAdditionalObjectType().equals(Constants.ADDITIONAL_OBJECT_TYPE_OPERATION)&&!inspectionItemAddition.getAdditionalObject().equals(operation)){
throw new BaseException("检验项目中工序[" + operation + "]不相同");
}
if (inspectionItemAddition.getAdditionalObjectType().equals(Constants.ADDITIONAL_OBJECT_TYPE_RESOURCE_TYPE)&&!inspectionItemAddition.getAdditionalObject().equals(resrceType)){
throw new BaseException("检验项目中设备类型[" + resrceType + "]不相同");
}
}
}else {
if (inspectionType.length()==1){
InspectionItemAddition itemAddition = new InspectionItemAddition();
itemAddition.setHandle(UUID.randomUUID().toString());
itemAddition.setInspectionItemBo(handle);
itemAddition.setSeq(1L);
itemAddition.setAdditionalObjectType(Constants.ADDITIONAL_OBJECT_TYPE_ITEM);
itemAddition.setAdditionalObject(item);
itemAddition.setDescription(currentItem.getDescription());
itemAddition.setCreateUser(user);
itemAddition.setCreatedDateTime(now);
itemAddition.setModifyUser(user);
itemAddition.setModifiedDateTime(now);
inspectionItemAdditionService.save(itemAddition);
InspectionItemAddition operationAddition = new InspectionItemAddition();
operationAddition.setHandle(UUID.randomUUID().toString());
operationAddition.setInspectionItemBo(handle);
operationAddition.setSeq(2L);
operationAddition.setAdditionalObjectType(Constants.ADDITIONAL_OBJECT_TYPE_OPERATION);
operationAddition.setAdditionalObject(operation);
operationAddition.setDescription(currentRevisionRef.getDescription());
operationAddition.setCreateUser(user);
operationAddition.setCreatedDateTime(now);
operationAddition.setModifyUser(user);
operationAddition.setModifiedDateTime(now);
inspectionItemAdditionService.save(operationAddition);
}else {
if (StringUtil.notBlank(resrceType)){
InspectionItemAddition inspectionItemAddition = new InspectionItemAddition();
inspectionItemAddition.setHandle(UUID.randomUUID().toString());
inspectionItemAddition.setInspectionItemBo(handle);
inspectionItemAddition.setSeq(1L);
inspectionItemAddition.setAdditionalObjectType(Constants.ADDITIONAL_OBJECT_TYPE_RESOURCE_TYPE);
inspectionItemAddition.setAdditionalObject(resrceType);
inspectionItemAddition.setDescription(selectResourceType.getDescription());
inspectionItemAddition.setCreateUser(user);
inspectionItemAddition.setCreatedDateTime(now);
inspectionItemAddition.setModifyUser(user);
inspectionItemAddition.setModifiedDateTime(now);
inspectionItemAdditionService.save(inspectionItemAddition);
}
}
}
queryWrapper=new QueryWrapper<InspectionItemDetail>();
queryWrapper.eq(InspectionItemDetail.INSPECTION_ITEM_BO,handle);
List<InspectionItemDetail> inspectionItemDetailList = inspectionItemDetailService.list(queryWrapper);
if (inspectionItemDetailList.size()>0){
long count = inspectionItemDetailList.stream().filter(inspectionItemDetail ->
inspectionItemDetail.getParamNo().equals(paramNo)
).count();
if (count>0){
throw new BaseException("检验名称不能重复");
}
}
InspectionItemDetail inspectionItemDetail = new InspectionItemDetail();
inspectionItemDetail.setHandle(UUID.randomUUID().toString());
inspectionItemDetail.setInspectionItemBo(handle);
inspectionItemDetail.setSeq(new Long(inspectionItemDetailList.size())+1L);
inspectionItemDetail.setParamNo(paramNo);
inspectionItemDetail.setDescription(paramDescription);
inspectionItemDetail.setInspectionMethod(inspectionMethod);
inspectionItemDetail.setParamType(paramType);
inspectionItemDetail.setParamUnit(paramUnit);
inspectionItemDetail.setDecimalNum(StringUtil.isBlank(decimalNum)?null:new Long(decimalNum));
inspectionItemDetail.setMinValue(StringUtil.isBlank(minValue)?null:new BigDecimal(minValue));
inspectionItemDetail.setStandardValue(standardValue);
inspectionItemDetail.setMaxValue(StringUtil.isBlank(maxValue)?null:new BigDecimal(maxValue));
inspectionItemDetail.setFalseValue(falseValue);
inspectionItemDetail.setTrueValue(trueValue);
inspectionItemDetail.setIsRequired(isRequired.equals("是")?"Y":"N");
inspectionItemDetail.setCheckNum(StringUtil.isBlank(checkNum)?null:new Long(checkNum));
inspectionItemDetail.setCreateUser(user);
inspectionItemDetail.setCreatedDateTime(now);
inspectionItemDetail.setModifyUser(user);
inspectionItemDetail.setModifiedDateTime(now);
inspectionItemDetailService.save(inspectionItemDetail);
}
}

43
common/src/main/java/com/foreverwin/mesnac/common/service/impl/PrintLogServiceImpl.java
Unescape Escape View File

@ -0,0 +1,43 @@
package com.foreverwin.mesnac.common.service.impl;
import com.foreverwin.mesnac.common.model.PrintLog;
import com.foreverwin.mesnac.common.mapper.PrintLogMapper;
import com.foreverwin.mesnac.common.service.PrintLogService;
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.Propagation;
import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDateTime;
/**
* <p>
* 服务实现类
* </p>
*
* @author Philip
* @since 2021-07-16
*/
@Service
@Transactional(rollbackFor = Exception.class)
public class PrintLogServiceImpl extends ServiceImpl<PrintLogMapper, PrintLog> implements PrintLogService {
@Autowired
private PrintLogMapper printLogMapper;
@Override
@Transactional(propagation = Propagation.REQUIRES_NEW)
public void savePrintLog(String site, String user, PrintLog printLog) {
LocalDateTime dateTime = LocalDateTime.now();
printLog.setSite(site);
printLog.setCreateUser(user);
printLog.setCreatedDateTime(dateTime);
printLog.setModifyUser(user);
printLog.setModifiedDateTime(dateTime);
this.save(printLog);
}
}

39
common/src/main/java/com/foreverwin/mesnac/common/service/impl/PrintServiceImpl.java
Unescape Escape View File

@ -0,0 +1,39 @@
package com.foreverwin.mesnac.common.service.impl;
import com.foreverwin.mesnac.common.model.PrintRequest;
import com.foreverwin.mesnac.common.service.PrintService;
import com.foreverwin.mesnac.common.util.HttpUtils;
import com.foreverwin.mesnac.meapi.util.StringUtils;
import com.foreverwin.modular.core.exception.BusinessException;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;
/**
* @author Ervin Chen
* @date 2020/3/6 13:38
*/
@Service
public class PrintServiceImpl implements PrintService {
@Value("${print.server}")
private String printServer;
@Override
public void print(PrintRequest printRequest) {
String printer = printRequest.getPrinter();
String printTemplate = printRequest.getTemplate();
if (StringUtils.isBlank(printer)) {
throw BusinessException.build("打印机未维护");
}
if (StringUtils.isBlank(printTemplate)) {
throw BusinessException.build("打印模板未维护");
}
//发送打印请求
ResponseEntity responseEntity = HttpUtils.callPost(printServer, "REQUEST_DATA=" + printRequest.toString());
}
}

178
common/src/main/java/com/foreverwin/mesnac/common/service/impl/ToolServiceImpl.java
Unescape Escape View File

@ -0,0 +1,178 @@
package com.foreverwin.mesnac.common.service.impl;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.foreverwin.mesnac.common.enums.HandleEnum;
import com.foreverwin.mesnac.common.mapper.ToolMapper;
import com.foreverwin.mesnac.common.model.Tool;
import com.foreverwin.mesnac.common.service.ToolService;
import com.foreverwin.modular.core.exception.BusinessException;
import com.foreverwin.modular.core.util.CommonMethods;
import com.foreverwin.modular.core.util.FrontPage;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDateTime;
import java.util.List;
/**
* <p>
* 工具表 服务实现类
* </p>
*
* @author pavel.liu
* @since 2021-07-14
*/
@Service
@Transactional(rollbackFor = Exception.class)
public class ToolServiceImpl extends ServiceImpl<ToolMapper, Tool> implements ToolService {
@Autowired
private ToolMapper toolMapper;
@Autowired
private ToolService toolService;
@Override
public IPage<Tool> selectPage(FrontPage<Tool> frontPage, Tool tool) {
QueryWrapper<Tool> queryWrapper = new QueryWrapper<>();
queryWrapper.setEntity(tool);
return super.page(frontPage.getPagePlus(), queryWrapper);
}
@Override
public List<Tool> selectList(Tool tool) {
QueryWrapper<Tool> queryWrapper = new QueryWrapper<>();
queryWrapper.setEntity(tool);
return super.list(queryWrapper);
}
@Override
public void saveOrUpdateOne(Tool tool) {
String site = tool.getSite();
String toolNo = tool.getTool();
String handle = HandleEnum.TOOL.getHandle(site, toolNo);
String user = CommonMethods.getUser();
tool.setHandle(handle);
Tool byId = toolMapper.selectById(handle);
if (byId != null){
tool.setCreateUser(byId.getCreateUser());
tool.setCreatedDateTime(byId.getCreatedDateTime());
tool.setModifyUser(user);
tool.setModifiedDateTime(LocalDateTime.now());
toolMapper.updateById(tool);
}else{
tool.setCreateUser(user);
tool.setCreatedDateTime(LocalDateTime.now());
toolMapper.insert(tool);
}
}
@Override
public Tool getOneToolByToolNo(String tool) {
String site = CommonMethods.getSite();
String handle = HandleEnum.TOOL.getHandle(site, tool);
return toolMapper.selectById(handle);
}
@Override
public void deleteInspectionPlanByHandle(String tool) {
String site = CommonMethods.getSite();
String handle = HandleEnum.TOOL.getHandle(site, tool);
String user = CommonMethods.getUser();
Tool byId = toolMapper.selectById(handle);
if (byId == null){
throw BusinessException.build("刀具编号不存在！");
}
byId.setStatus("N");
byId.setModifyUser(user);
byId.setModifiedDateTime(LocalDateTime.now());
toolMapper.updateById(byId);
}
@Override
public String saveOrUpdateToolByImport(JSONObject json, String sqlType) {
String user = CommonMethods.getUser();
Tool target = new Tool();
String site = json.getString("site").trim();
String tool = json.getString("tool").trim();
String handle = HandleEnum.TOOL.getHandle(site, tool).trim();
String description = json.getString("description").trim();
String specification = json.getString("specification").trim();
String brand = json.getString("brand").trim();
String remark = json.getString("remark").trim();
if (tool==null || tool != ""){
return "刀具编号不能为空";
}
switch (sqlType){
case "insert":
target.setTool(tool);
target.setHandle(handle);
target.setDescription(description);
target.setSpecification(specification);
target.setBrand(brand);
target.setCreateUser(user);
target.setCreatedDateTime(LocalDateTime.now());
toolMapper.insert(target);
break;
case "update":
Tool byId = toolMapper.selectById(handle);
if (byId == null){
return "更新失败，刀具编号不存在！";
}
if (description != ""){
byId.setDescription(description);
}
if (specification != ""){
byId.setSpecification(specification);
}
if (brand != ""){
byId.setBrand(brand);
}
if (remark != ""){
byId.setRemark(remark);
}
toolMapper.updateById(byId);
break;
case "both":
Tool selId = toolMapper.selectById(handle);
if (selId != null){
if (description != ""){
selId.setDescription(description);
}
if (specification != ""){
selId.setSpecification(specification);
}
if (brand != ""){
selId.setBrand(brand);
}
if (remark != ""){
selId.setRemark(remark);
}
selId.setModifyUser(user);
selId.setModifiedDateTime(LocalDateTime.now());
toolMapper.updateById(selId);
break;
}
target.setTool(tool);
target.setHandle(handle);
target.setDescription(description);
target.setSpecification(specification);
target.setBrand(brand);
target.setCreateUser(user);
target.setCreatedDateTime(LocalDateTime.now());
toolMapper.insert(target);
break;
default:
return "更新/导入类型未找到！";
}
return "导入成功";
}
}

19
common/src/main/java/com/foreverwin/mesnac/common/util/HttpUtils.java
Unescape Escape View File

@ -4,6 +4,8 @@ import org.jsoup.Connection;
import org.jsoup.Connection.Method;
import org.jsoup.Connection.Response;
import org.jsoup.Jsoup;
import org.springframework.http.*;
import org.springframework.web.client.RestTemplate;
import javax.net.ssl.*;
import java.io.*;
@ -319,4 +321,21 @@ public class HttpUtils {
e.printStackTrace();
}
}
/**
* POST请求
*
* @param url
* @param requestBody
* @return
*/
public static ResponseEntity callPost(String url, String requestBody ){
RestTemplate httpClient = new RestTemplate();
HttpHeaders headers = new HttpHeaders();
headers.setContentType(MediaType.parseMediaType("application/x-www-form-urlencoded; charset=UTF-8"));
HttpEntity<String> entity = new HttpEntity<String>( requestBody, headers );
ResponseEntity<String> responseEntity = httpClient.exchange(url, HttpMethod.POST, entity, String.class);
return responseEntity;
}
}

2
common/src/main/resources/mapper/InspectionItemMapper.xml
Unescape Escape View File

@ -463,7 +463,7 @@
</select>
<select id="checkRouterStep" resultType="java.lang.Integer">
SELECTRS FROM ROUTER_STEP RS
SELECT COUNT(rs.HANDLE) FROM ROUTER_STEP RS
JOIN ROUTER_OPERATION ro ON RS.HANDLE =ro.ROUTER_STEP_BO
JOIN OPERATION OP ON OP.HANDLE= ro.OPERATION_BO OR ('OperationBO:' || OP.SITE || ',' || OP.OPERATION || ',#' = ro.OPERATION_BO AND OP.CURRENT_REVISION = 'true')
WHERE op.SITE=#{site} AND rs.STEP_ID=#{stepId} AND op.OPERATION=#{operation}

578
common/src/main/resources/mapper/PrintLogMapper.xml
Unescape Escape View File

@ -0,0 +1,578 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.foreverwin.mesnac.common.mapper.PrintLogMapper">
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="com.foreverwin.mesnac.common.model.PrintLog">
<id column="HANDLE" property="handle" />
<result column="SITE" property="site" />
<result column="CATEGORY" property="category" />
<result column="PRINT_NAME" property="printName" />
<result column="PRINT_TEMPLATE" property="printTemplate" />
<result column="PRINT_PARAM" property="printParam" />
<result column="SFC" property="sfc" />
<result column="RESRCE" property="resrce" />
<result column="STEP_ID" property="stepId" />
<result column="OPERATION" property="operation" />
<result column="INVENTORY" property="inventory" />
<result column="COMMENTS" property="comments" />
<result column="OTHER_1" property="other1" />
<result column="OTHER_2" property="other2" />
<result column="OTHER_3" property="other3" />
<result column="OTHER_4" property="other4" />
<result column="OTHER_5" property="other5" />
<result column="CREATE_USER" property="createUser" />
<result column="CREATED_DATE_TIME" property="createdDateTime" />
<result column="MODIFY_USER" property="modifyUser" />
<result column="MODIFIED_DATE_TIME" property="modifiedDateTime" />
</resultMap>
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
HANDLE, SITE, CATEGORY, PRINT_NAME, PRINT_TEMPLATE, PRINT_PARAM, SFC, RESRCE, STEP_ID, OPERATION, INVENTORY, COMMENTS, OTHER_1, OTHER_2, OTHER_3, OTHER_4, OTHER_5, CREATE_USER, CREATED_DATE_TIME, MODIFY_USER, MODIFIED_DATE_TIME
</sql>
<!-- BaseMapper标准查询/修改/删除 -->
<select id="selectById" resultMap="BaseResultMap">
SELECT <include refid="Base_Column_List"></include> FROM Z_PRINT_LOG WHERE HANDLE=#{handle}
</select>
<select id="selectByMap" resultMap="BaseResultMap">
SELECT <include refid="Base_Column_List"></include>
FROM Z_PRINT_LOG
<if test="cm!=null and !cm.isEmpty">
<where>
<foreach collection="cm.keys" item="k" separator="AND">
<if test="cm[k] != null">
${k} = #{cm[${k}]}
</if>
</foreach>
</where>
</if>
</select>
<select id="selectBatchIds" resultMap="BaseResultMap">
SELECT <include refid="Base_Column_List"></include>
FROM Z_PRINT_LOG WHERE HANDLE IN (
<foreach item="item" index="index" collection="coll" separator=",">#{item}
</foreach>)
</select>
<select id="selectOne" resultMap="BaseResultMap">
SELECT <include refid="Base_Column_List"></include> FROM Z_PRINT_LOG
<where>
<if test="ew.entity.handle!=null">
HANDLE=#{ew.handle}
</if>
<if test="ew.entity.site!=null"> AND SITE=#{ew.entity.site}</if>
<if test="ew.entity.category!=null"> AND CATEGORY=#{ew.entity.category}</if>
<if test="ew.entity.printName!=null"> AND PRINT_NAME=#{ew.entity.printName}</if>
<if test="ew.entity.printTemplate!=null"> AND PRINT_TEMPLATE=#{ew.entity.printTemplate}</if>
<if test="ew.entity.printParam!=null"> AND PRINT_PARAM=#{ew.entity.printParam}</if>
<if test="ew.entity.sfc!=null"> AND SFC=#{ew.entity.sfc}</if>
<if test="ew.entity.resrce!=null"> AND RESRCE=#{ew.entity.resrce}</if>
<if test="ew.entity.stepId!=null"> AND STEP_ID=#{ew.entity.stepId}</if>
<if test="ew.entity.operation!=null"> AND OPERATION=#{ew.entity.operation}</if>
<if test="ew.entity.inventory!=null"> AND INVENTORY=#{ew.entity.inventory}</if>
<if test="ew.entity.comments!=null"> AND COMMENTS=#{ew.entity.comments}</if>
<if test="ew.entity.other1!=null"> AND OTHER_1=#{ew.entity.other1}</if>
<if test="ew.entity.other2!=null"> AND OTHER_2=#{ew.entity.other2}</if>
<if test="ew.entity.other3!=null"> AND OTHER_3=#{ew.entity.other3}</if>
<if test="ew.entity.other4!=null"> AND OTHER_4=#{ew.entity.other4}</if>
<if test="ew.entity.other5!=null"> AND OTHER_5=#{ew.entity.other5}</if>
<if test="ew.entity.createUser!=null"> AND CREATE_USER=#{ew.entity.createUser}</if>
<if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
<if test="ew.entity.modifyUser!=null"> AND MODIFY_USER=#{ew.entity.modifyUser}</if>
<if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
</where>
</select>
<select id="selectCount" resultType="Integer">
SELECT COUNT(1) FROM Z_PRINT_LOG
<where>
<if test="ew!=null">
<if test="ew.entity!=null">
<if test="ew.entity.handle!=null">
HANDLE=#{ew.entity.handle}
</if>
<if test="ew.entity.site!=null"> AND SITE=#{ew.entity.site}</if>
<if test="ew.entity.category!=null"> AND CATEGORY=#{ew.entity.category}</if>
<if test="ew.entity.printName!=null"> AND PRINT_NAME=#{ew.entity.printName}</if>
<if test="ew.entity.printTemplate!=null"> AND PRINT_TEMPLATE=#{ew.entity.printTemplate}</if>
<if test="ew.entity.printParam!=null"> AND PRINT_PARAM=#{ew.entity.printParam}</if>
<if test="ew.entity.sfc!=null"> AND SFC=#{ew.entity.sfc}</if>
<if test="ew.entity.resrce!=null"> AND RESRCE=#{ew.entity.resrce}</if>
<if test="ew.entity.stepId!=null"> AND STEP_ID=#{ew.entity.stepId}</if>
<if test="ew.entity.operation!=null"> AND OPERATION=#{ew.entity.operation}</if>
<if test="ew.entity.inventory!=null"> AND INVENTORY=#{ew.entity.inventory}</if>
<if test="ew.entity.comments!=null"> AND COMMENTS=#{ew.entity.comments}</if>
<if test="ew.entity.other1!=null"> AND OTHER_1=#{ew.entity.other1}</if>
<if test="ew.entity.other2!=null"> AND OTHER_2=#{ew.entity.other2}</if>
<if test="ew.entity.other3!=null"> AND OTHER_3=#{ew.entity.other3}</if>
<if test="ew.entity.other4!=null"> AND OTHER_4=#{ew.entity.other4}</if>
<if test="ew.entity.other5!=null"> AND OTHER_5=#{ew.entity.other5}</if>
<if test="ew.entity.createUser!=null"> AND CREATE_USER=#{ew.entity.createUser}</if>
<if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
<if test="ew.entity.modifyUser!=null"> AND MODIFY_USER=#{ew.entity.modifyUser}</if>
<if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
</if>
<if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
${ew.sqlSegment}
</if>
</if>
</where>
<if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">
${ew.sqlSegment}
</if>
</select>
<select id="selectList" resultMap="BaseResultMap">
SELECT <choose><when test="ew != null and ew.sqlSelect != null">${ew.sqlSelect}</when><otherwise><include refid="Base_Column_List"></include></otherwise></choose> FROM Z_PRINT_LOG
<where>
<if test="ew!=null">
<if test="ew.entity!=null">
<if test="ew.entity.handle!=null">
HANDLE=#{ew.entity.handle}
</if>
<if test="ew.entity.site!=null"> AND SITE=#{ew.entity.site}</if>
<if test="ew.entity.category!=null"> AND CATEGORY=#{ew.entity.category}</if>
<if test="ew.entity.printName!=null"> AND PRINT_NAME=#{ew.entity.printName}</if>
<if test="ew.entity.printTemplate!=null"> AND PRINT_TEMPLATE=#{ew.entity.printTemplate}</if>
<if test="ew.entity.printParam!=null"> AND PRINT_PARAM=#{ew.entity.printParam}</if>
<if test="ew.entity.sfc!=null"> AND SFC=#{ew.entity.sfc}</if>
<if test="ew.entity.resrce!=null"> AND RESRCE=#{ew.entity.resrce}</if>
<if test="ew.entity.stepId!=null"> AND STEP_ID=#{ew.entity.stepId}</if>
<if test="ew.entity.operation!=null"> AND OPERATION=#{ew.entity.operation}</if>
<if test="ew.entity.inventory!=null"> AND INVENTORY=#{ew.entity.inventory}</if>
<if test="ew.entity.comments!=null"> AND COMMENTS=#{ew.entity.comments}</if>
<if test="ew.entity.other1!=null"> AND OTHER_1=#{ew.entity.other1}</if>
<if test="ew.entity.other2!=null"> AND OTHER_2=#{ew.entity.other2}</if>
<if test="ew.entity.other3!=null"> AND OTHER_3=#{ew.entity.other3}</if>
<if test="ew.entity.other4!=null"> AND OTHER_4=#{ew.entity.other4}</if>
<if test="ew.entity.other5!=null"> AND OTHER_5=#{ew.entity.other5}</if>
<if test="ew.entity.createUser!=null"> AND CREATE_USER=#{ew.entity.createUser}</if>
<if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
<if test="ew.entity.modifyUser!=null"> AND MODIFY_USER=#{ew.entity.modifyUser}</if>
<if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
</if>
<if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
${ew.sqlSegment}
</if>
</if>
</where>
<if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">
${ew.sqlSegment}
</if>
</select>
<select id="selectMaps" resultType="HashMap">
SELECT <choose><when test="ew != null and ew.sqlSelect != null">${ew.sqlSelect}</when><otherwise><include refid="Base_Column_List"></include></otherwise></choose> FROM Z_PRINT_LOG
<where>
<if test="ew!=null">
<if test="ew.entity!=null">
<if test="ew.entity.handle!=null">
HANDLE=#{ew.entity.handle}
</if>
<if test="ew.entity.site!=null"> AND SITE=#{ew.entity.site}</if>
<if test="ew.entity.category!=null"> AND CATEGORY=#{ew.entity.category}</if>
<if test="ew.entity.printName!=null"> AND PRINT_NAME=#{ew.entity.printName}</if>
<if test="ew.entity.printTemplate!=null"> AND PRINT_TEMPLATE=#{ew.entity.printTemplate}</if>
<if test="ew.entity.printParam!=null"> AND PRINT_PARAM=#{ew.entity.printParam}</if>
<if test="ew.entity.sfc!=null"> AND SFC=#{ew.entity.sfc}</if>
<if test="ew.entity.resrce!=null"> AND RESRCE=#{ew.entity.resrce}</if>
<if test="ew.entity.stepId!=null"> AND STEP_ID=#{ew.entity.stepId}</if>
<if test="ew.entity.operation!=null"> AND OPERATION=#{ew.entity.operation}</if>
<if test="ew.entity.inventory!=null"> AND INVENTORY=#{ew.entity.inventory}</if>
<if test="ew.entity.comments!=null"> AND COMMENTS=#{ew.entity.comments}</if>
<if test="ew.entity.other1!=null"> AND OTHER_1=#{ew.entity.other1}</if>
<if test="ew.entity.other2!=null"> AND OTHER_2=#{ew.entity.other2}</if>
<if test="ew.entity.other3!=null"> AND OTHER_3=#{ew.entity.other3}</if>
<if test="ew.entity.other4!=null"> AND OTHER_4=#{ew.entity.other4}</if>
<if test="ew.entity.other5!=null"> AND OTHER_5=#{ew.entity.other5}</if>
<if test="ew.entity.createUser!=null"> AND CREATE_USER=#{ew.entity.createUser}</if>
<if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
<if test="ew.entity.modifyUser!=null"> AND MODIFY_USER=#{ew.entity.modifyUser}</if>
<if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
</if>
<if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
${ew.sqlSegment}
</if>
</if>
</where>
<if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">
${ew.sqlSegment}
</if>
</select>
<select id="selectObjs" resultType="Object">
SELECT <choose><when test="ew != null and ew.sqlSelect != null">${ew.sqlSelect}</when><otherwise><include refid="Base_Column_List"></include></otherwise></choose> FROM Z_PRINT_LOG
<where>
<if test="ew!=null">
<if test="ew.entity!=null">
<if test="ew.entity.handle!=null">
HANDLE=#{ew.entity.handle}
</if>
<if test="ew.entity.site!=null"> AND SITE=#{ew.entity.site}</if>
<if test="ew.entity.category!=null"> AND CATEGORY=#{ew.entity.category}</if>
<if test="ew.entity.printName!=null"> AND PRINT_NAME=#{ew.entity.printName}</if>
<if test="ew.entity.printTemplate!=null"> AND PRINT_TEMPLATE=#{ew.entity.printTemplate}</if>
<if test="ew.entity.printParam!=null"> AND PRINT_PARAM=#{ew.entity.printParam}</if>
<if test="ew.entity.sfc!=null"> AND SFC=#{ew.entity.sfc}</if>
<if test="ew.entity.resrce!=null"> AND RESRCE=#{ew.entity.resrce}</if>
<if test="ew.entity.stepId!=null"> AND STEP_ID=#{ew.entity.stepId}</if>
<if test="ew.entity.operation!=null"> AND OPERATION=#{ew.entity.operation}</if>
<if test="ew.entity.inventory!=null"> AND INVENTORY=#{ew.entity.inventory}</if>
<if test="ew.entity.comments!=null"> AND COMMENTS=#{ew.entity.comments}</if>
<if test="ew.entity.other1!=null"> AND OTHER_1=#{ew.entity.other1}</if>
<if test="ew.entity.other2!=null"> AND OTHER_2=#{ew.entity.other2}</if>
<if test="ew.entity.other3!=null"> AND OTHER_3=#{ew.entity.other3}</if>
<if test="ew.entity.other4!=null"> AND OTHER_4=#{ew.entity.other4}</if>
<if test="ew.entity.other5!=null"> AND OTHER_5=#{ew.entity.other5}</if>
<if test="ew.entity.createUser!=null"> AND CREATE_USER=#{ew.entity.createUser}</if>
<if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
<if test="ew.entity.modifyUser!=null"> AND MODIFY_USER=#{ew.entity.modifyUser}</if>
<if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
</if>
<if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
${ew.sqlSegment}
</if>
</if>
</where>
<if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">
${ew.sqlSegment}
</if>
</select>
<select id="selectPage" resultMap="BaseResultMap">
SELECT <choose><when test="ew != null and ew.sqlSelect != null">${ew.sqlSelect}</when><otherwise><include refid="Base_Column_List"></include></otherwise></choose> FROM Z_PRINT_LOG
<where>
<if test="ew!=null">
<if test="ew.entity!=null">
<if test="ew.entity.handle!=null">
HANDLE=#{ew.entity.handle}
</if>
<if test="ew.entity.site!=null"> AND SITE=#{ew.entity.site}</if>
<if test="ew.entity.category!=null"> AND CATEGORY=#{ew.entity.category}</if>
<if test="ew.entity.printName!=null"> AND PRINT_NAME=#{ew.entity.printName}</if>
<if test="ew.entity.printTemplate!=null"> AND PRINT_TEMPLATE=#{ew.entity.printTemplate}</if>
<if test="ew.entity.printParam!=null"> AND PRINT_PARAM=#{ew.entity.printParam}</if>
<if test="ew.entity.sfc!=null"> AND SFC=#{ew.entity.sfc}</if>
<if test="ew.entity.resrce!=null"> AND RESRCE=#{ew.entity.resrce}</if>
<if test="ew.entity.stepId!=null"> AND STEP_ID=#{ew.entity.stepId}</if>
<if test="ew.entity.operation!=null"> AND OPERATION=#{ew.entity.operation}</if>
<if test="ew.entity.inventory!=null"> AND INVENTORY=#{ew.entity.inventory}</if>
<if test="ew.entity.comments!=null"> AND COMMENTS=#{ew.entity.comments}</if>
<if test="ew.entity.other1!=null"> AND OTHER_1=#{ew.entity.other1}</if>
<if test="ew.entity.other2!=null"> AND OTHER_2=#{ew.entity.other2}</if>
<if test="ew.entity.other3!=null"> AND OTHER_3=#{ew.entity.other3}</if>
<if test="ew.entity.other4!=null"> AND OTHER_4=#{ew.entity.other4}</if>
<if test="ew.entity.other5!=null"> AND OTHER_5=#{ew.entity.other5}</if>
<if test="ew.entity.createUser!=null"> AND CREATE_USER=#{ew.entity.createUser}</if>
<if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
<if test="ew.entity.modifyUser!=null"> AND MODIFY_USER=#{ew.entity.modifyUser}</if>
<if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
</if>
<if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
${ew.sqlSegment}
</if>
</if>
</where>
<if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">
${ew.sqlSegment}
</if>
</select>
<select id="selectMapsPage" resultType="HashMap">
SELECT <choose><when test="ew != null and ew.sqlSelect != null">${ew.sqlSelect}</when><otherwise><include refid="Base_Column_List"></include></otherwise></choose> FROM Z_PRINT_LOG
<where>
<if test="ew!=null">
<if test="ew.entity!=null">
<if test="ew.entity.handle!=null">
HANDLE=#{ew.entity.handle}
</if>
<if test="ew.entity.site!=null"> AND SITE=#{ew.entity.site}</if>
<if test="ew.entity.category!=null"> AND CATEGORY=#{ew.entity.category}</if>
<if test="ew.entity.printName!=null"> AND PRINT_NAME=#{ew.entity.printName}</if>
<if test="ew.entity.printTemplate!=null"> AND PRINT_TEMPLATE=#{ew.entity.printTemplate}</if>
<if test="ew.entity.printParam!=null"> AND PRINT_PARAM=#{ew.entity.printParam}</if>
<if test="ew.entity.sfc!=null"> AND SFC=#{ew.entity.sfc}</if>
<if test="ew.entity.resrce!=null"> AND RESRCE=#{ew.entity.resrce}</if>
<if test="ew.entity.stepId!=null"> AND STEP_ID=#{ew.entity.stepId}</if>
<if test="ew.entity.operation!=null"> AND OPERATION=#{ew.entity.operation}</if>
<if test="ew.entity.inventory!=null"> AND INVENTORY=#{ew.entity.inventory}</if>
<if test="ew.entity.comments!=null"> AND COMMENTS=#{ew.entity.comments}</if>
<if test="ew.entity.other1!=null"> AND OTHER_1=#{ew.entity.other1}</if>
<if test="ew.entity.other2!=null"> AND OTHER_2=#{ew.entity.other2}</if>
<if test="ew.entity.other3!=null"> AND OTHER_3=#{ew.entity.other3}</if>
<if test="ew.entity.other4!=null"> AND OTHER_4=#{ew.entity.other4}</if>
<if test="ew.entity.other5!=null"> AND OTHER_5=#{ew.entity.other5}</if>
<if test="ew.entity.createUser!=null"> AND CREATE_USER=#{ew.entity.createUser}</if>
<if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
<if test="ew.entity.modifyUser!=null"> AND MODIFY_USER=#{ew.entity.modifyUser}</if>
<if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
</if>
<if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
${ew.sqlSegment}
</if>
</if>
</where>
<if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">
${ew.sqlSegment}
</if>
</select>
<insert id="insert" parameterType="com.foreverwin.mesnac.common.model.PrintLog">
INSERT INTO Z_PRINT_LOG
<trim prefix="(" suffix=")" suffixOverrides=",">
HANDLE,
<if test="site!=null">SITE,</if>
<if test="category!=null">CATEGORY,</if>
<if test="printName!=null">PRINT_NAME,</if>
<if test="printTemplate!=null">PRINT_TEMPLATE,</if>
<if test="printParam!=null">PRINT_PARAM,</if>
<if test="sfc!=null">SFC,</if>
<if test="resrce!=null">RESRCE,</if>
<if test="stepId!=null">STEP_ID,</if>
<if test="operation!=null">OPERATION,</if>
<if test="inventory!=null">INVENTORY,</if>
<if test="comments!=null">COMMENTS,</if>
<if test="other1!=null">OTHER_1,</if>
<if test="other2!=null">OTHER_2,</if>
<if test="other3!=null">OTHER_3,</if>
<if test="other4!=null">OTHER_4,</if>
<if test="other5!=null">OTHER_5,</if>
<if test="createUser!=null">CREATE_USER,</if>
<if test="createdDateTime!=null">CREATED_DATE_TIME,</if>
<if test="modifyUser!=null">MODIFY_USER,</if>
<if test="modifiedDateTime!=null">MODIFIED_DATE_TIME,</if>
</trim> VALUES
<trim prefix="(" suffix=")" suffixOverrides=",">
#{handle},
<if test="site!=null">#{site},</if>
<if test="category!=null">#{category},</if>
<if test="printName!=null">#{printName},</if>
<if test="printTemplate!=null">#{printTemplate},</if>
<if test="printParam!=null">#{printParam},</if>
<if test="sfc!=null">#{sfc},</if>
<if test="resrce!=null">#{resrce},</if>
<if test="stepId!=null">#{stepId},</if>
<if test="operation!=null">#{operation},</if>
<if test="inventory!=null">#{inventory},</if>
<if test="comments!=null">#{comments},</if>
<if test="other1!=null">#{other1},</if>
<if test="other2!=null">#{other2},</if>
<if test="other3!=null">#{other3},</if>
<if test="other4!=null">#{other4},</if>
<if test="other5!=null">#{other5},</if>
<if test="createUser!=null">#{createUser},</if>
<if test="createdDateTime!=null">#{createdDateTime},</if>
<if test="modifyUser!=null">#{modifyUser},</if>
<if test="modifiedDateTime!=null">#{modifiedDateTime},</if>
</trim>
</insert>
<insert id="insertAllColumn" parameterType="com.foreverwin.mesnac.common.model.PrintLog">
INSERT INTO Z_PRINT_LOG
<trim prefix="(" suffix=")" suffixOverrides=",">
<include refid="Base_Column_List"></include>
</trim> VALUES
<trim prefix="(" suffix=")" suffixOverrides=",">
#{handle},
#{site},
#{category},
#{printName},
#{printTemplate},
#{printParam},
#{sfc},
#{resrce},
#{stepId},
#{operation},
#{inventory},
#{comments},
#{other1},
#{other2},
#{other3},
#{other4},
#{other5},
#{createUser},
#{createdDateTime},
#{modifyUser},
#{modifiedDateTime},
</trim>
</insert>
<update id="updateById">
UPDATE Z_PRINT_LOG <trim prefix="SET" suffixOverrides=",">
<if test="et.site!=null">SITE=#{et.site},</if>
<if test="et.category!=null">CATEGORY=#{et.category},</if>
<if test="et.printName!=null">PRINT_NAME=#{et.printName},</if>
<if test="et.printTemplate!=null">PRINT_TEMPLATE=#{et.printTemplate},</if>
<if test="et.printParam!=null">PRINT_PARAM=#{et.printParam},</if>
<if test="et.sfc!=null">SFC=#{et.sfc},</if>
<if test="et.resrce!=null">RESRCE=#{et.resrce},</if>
<if test="et.stepId!=null">STEP_ID=#{et.stepId},</if>
<if test="et.operation!=null">OPERATION=#{et.operation},</if>
<if test="et.inventory!=null">INVENTORY=#{et.inventory},</if>
<if test="et.comments!=null">COMMENTS=#{et.comments},</if>
<if test="et.other1!=null">OTHER_1=#{et.other1},</if>
<if test="et.other2!=null">OTHER_2=#{et.other2},</if>
<if test="et.other3!=null">OTHER_3=#{et.other3},</if>
<if test="et.other4!=null">OTHER_4=#{et.other4},</if>
<if test="et.other5!=null">OTHER_5=#{et.other5},</if>
<if test="et.createUser!=null">CREATE_USER=#{et.createUser},</if>
<if test="et.createdDateTime!=null">CREATED_DATE_TIME=#{et.createdDateTime},</if>
<if test="et.modifyUser!=null">MODIFY_USER=#{et.modifyUser},</if>
<if test="et.modifiedDateTime!=null">MODIFIED_DATE_TIME=#{et.modifiedDateTime},</if>
</trim> WHERE HANDLE=#{et.handle} <if test="et instanceof java.util.Map"><if test="et.MP_OPTLOCK_VERSION_ORIGINAL!=null">and ${et.MP_OPTLOCK_VERSION_COLUMN}=#{et.MP_OPTLOCK_VERSION_ORIGINAL}</if></if>
</update>
<update id="updateAllColumnById">
UPDATE Z_PRINT_LOG <trim prefix="SET" suffixOverrides=",">
SITE=#{et.site},
CATEGORY=#{et.category},
PRINT_NAME=#{et.printName},
PRINT_TEMPLATE=#{et.printTemplate},
PRINT_PARAM=#{et.printParam},
SFC=#{et.sfc},
RESRCE=#{et.resrce},
STEP_ID=#{et.stepId},
OPERATION=#{et.operation},
INVENTORY=#{et.inventory},
COMMENTS=#{et.comments},
OTHER_1=#{et.other1},
OTHER_2=#{et.other2},
OTHER_3=#{et.other3},
OTHER_4=#{et.other4},
OTHER_5=#{et.other5},
CREATE_USER=#{et.createUser},
CREATED_DATE_TIME=#{et.createdDateTime},
MODIFY_USER=#{et.modifyUser},
MODIFIED_DATE_TIME=#{et.modifiedDateTime},
</trim> WHERE HANDLE=#{et.handle} <if test="et instanceof java.util.Map"><if test="et.MP_OPTLOCK_VERSION_ORIGINAL!=null">and ${et.MP_OPTLOCK_VERSION_COLUMN}=#{et.MP_OPTLOCK_VERSION_ORIGINAL}</if></if>
</update>
<update id="update">
UPDATE Z_PRINT_LOG <trim prefix="SET" suffixOverrides=",">
<if test="et.site!=null">SITE=#{et.site},</if>
<if test="et.category!=null">CATEGORY=#{et.category},</if>
<if test="et.printName!=null">PRINT_NAME=#{et.printName},</if>
<if test="et.printTemplate!=null">PRINT_TEMPLATE=#{et.printTemplate},</if>
<if test="et.printParam!=null">PRINT_PARAM=#{et.printParam},</if>
<if test="et.sfc!=null">SFC=#{et.sfc},</if>
<if test="et.resrce!=null">RESRCE=#{et.resrce},</if>
<if test="et.stepId!=null">STEP_ID=#{et.stepId},</if>
<if test="et.operation!=null">OPERATION=#{et.operation},</if>
<if test="et.inventory!=null">INVENTORY=#{et.inventory},</if>
<if test="et.comments!=null">COMMENTS=#{et.comments},</if>
<if test="et.other1!=null">OTHER_1=#{et.other1},</if>
<if test="et.other2!=null">OTHER_2=#{et.other2},</if>
<if test="et.other3!=null">OTHER_3=#{et.other3},</if>
<if test="et.other4!=null">OTHER_4=#{et.other4},</if>
<if test="et.other5!=null">OTHER_5=#{et.other5},</if>
<if test="et.createUser!=null">CREATE_USER=#{et.createUser},</if>
<if test="et.createdDateTime!=null">CREATED_DATE_TIME=#{et.createdDateTime},</if>
<if test="et.modifyUser!=null">MODIFY_USER=#{et.modifyUser},</if>
<if test="et.modifiedDateTime!=null">MODIFIED_DATE_TIME=#{et.modifiedDateTime},</if>
</trim>
<where>
<if test="ew!=null">
<if test="ew.entity!=null">
HANDLE=#{ew.entity.handle}
<if test="ew.entity.site!=null"> AND SITE=#{ew.entity.site}</if>
<if test="ew.entity.category!=null"> AND CATEGORY=#{ew.entity.category}</if>
<if test="ew.entity.printName!=null"> AND PRINT_NAME=#{ew.entity.printName}</if>
<if test="ew.entity.printTemplate!=null"> AND PRINT_TEMPLATE=#{ew.entity.printTemplate}</if>
<if test="ew.entity.printParam!=null"> AND PRINT_PARAM=#{ew.entity.printParam}</if>
<if test="ew.entity.sfc!=null"> AND SFC=#{ew.entity.sfc}</if>
<if test="ew.entity.resrce!=null"> AND RESRCE=#{ew.entity.resrce}</if>
<if test="ew.entity.stepId!=null"> AND STEP_ID=#{ew.entity.stepId}</if>
<if test="ew.entity.operation!=null"> AND OPERATION=#{ew.entity.operation}</if>
<if test="ew.entity.inventory!=null"> AND INVENTORY=#{ew.entity.inventory}</if>
<if test="ew.entity.comments!=null"> AND COMMENTS=#{ew.entity.comments}</if>
<if test="ew.entity.other1!=null"> AND OTHER_1=#{ew.entity.other1}</if>
<if test="ew.entity.other2!=null"> AND OTHER_2=#{ew.entity.other2}</if>
<if test="ew.entity.other3!=null"> AND OTHER_3=#{ew.entity.other3}</if>
<if test="ew.entity.other4!=null"> AND OTHER_4=#{ew.entity.other4}</if>
<if test="ew.entity.other5!=null"> AND OTHER_5=#{ew.entity.other5}</if>
<if test="ew.entity.createUser!=null"> AND CREATE_USER=#{ew.entity.createUser}</if>
<if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
<if test="ew.entity.modifyUser!=null"> AND MODIFY_USER=#{ew.entity.modifyUser}</if>
<if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
</if>
<if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
${ew.sqlSegment}
</if>
</if>
</where>
<if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">
${ew.sqlSegment}
</if>
</update>
<delete id="deleteById">
DELETE FROM Z_PRINT_LOG WHERE HANDLE=#{handle}
</delete>
<delete id="deleteByMap">
DELETE FROM Z_PRINT_LOG
<if test="cm!=null and !cm.isEmpty">
<where>
<foreach collection="cm.keys" item="k" separator="AND">
<if test="cm[k] != null">
${k} = #{cm[${k}]}
</if>
</foreach>
</where>
</if>
</delete>
<delete id="delete">
DELETE FROM Z_PRINT_LOG
<where>
<if test="ew!=null">
<if test="ew.entity!=null">
<if test="ew.entity.handle!=null">
HANDLE=#{ew.entity.handle}
</if>
<if test="ew.entity.site!=null"> AND SITE=#{ew.entity.site}</if>
<if test="ew.entity.category!=null"> AND CATEGORY=#{ew.entity.category}</if>
<if test="ew.entity.printName!=null"> AND PRINT_NAME=#{ew.entity.printName}</if>
<if test="ew.entity.printTemplate!=null"> AND PRINT_TEMPLATE=#{ew.entity.printTemplate}</if>
<if test="ew.entity.printParam!=null"> AND PRINT_PARAM=#{ew.entity.printParam}</if>
<if test="ew.entity.sfc!=null"> AND SFC=#{ew.entity.sfc}</if>
<if test="ew.entity.resrce!=null"> AND RESRCE=#{ew.entity.resrce}</if>
<if test="ew.entity.stepId!=null"> AND STEP_ID=#{ew.entity.stepId}</if>
<if test="ew.entity.operation!=null"> AND OPERATION=#{ew.entity.operation}</if>
<if test="ew.entity.inventory!=null"> AND INVENTORY=#{ew.entity.inventory}</if>
<if test="ew.entity.comments!=null"> AND COMMENTS=#{ew.entity.comments}</if>
<if test="ew.entity.other1!=null"> AND OTHER_1=#{ew.entity.other1}</if>
<if test="ew.entity.other2!=null"> AND OTHER_2=#{ew.entity.other2}</if>
<if test="ew.entity.other3!=null"> AND OTHER_3=#{ew.entity.other3}</if>
<if test="ew.entity.other4!=null"> AND OTHER_4=#{ew.entity.other4}</if>
<if test="ew.entity.other5!=null"> AND OTHER_5=#{ew.entity.other5}</if>
<if test="ew.entity.createUser!=null"> AND CREATE_USER=#{ew.entity.createUser}</if>
<if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
<if test="ew.entity.modifyUser!=null"> AND MODIFY_USER=#{ew.entity.modifyUser}</if>
<if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
</if>
<if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
${ew.sqlSegment}
</if>
</if>
</where>
<if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">
${ew.sqlSegment}
</if>
</delete>
<delete id="deleteBatchIds">
DELETE FROM Z_PRINT_LOG WHERE HANDLE IN (
<foreach item="item" index="index" collection="coll" separator=",">#{item}
</foreach>)
</delete>
<!-- BaseMapper标准查询/修改/删除 -->
</mapper>

8
production/src/main/resources/mapper/ToolMapper.xml → common/src/main/resources/mapper/ToolMapper.xml
Unescape Escape View File

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.foreverwin.mesnac.production.mapper.ToolMapper">
<mapper namespace="com.foreverwin.mesnac.common.mapper.ToolMapper">
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="com.foreverwin.mesnac.production.model.Tool">
<resultMap id="BaseResultMap" type="com.foreverwin.mesnac.common.model.Tool">
<id column="HANDLE" property="handle" />
<result column="SITE" property="site" />
<result column="TOOL" property="tool" />
@ -257,7 +257,7 @@
</if>
</select>
<insert id="insert" parameterType="com.foreverwin.mesnac.production.model.Tool">
<insert id="insert" parameterType="com.foreverwin.mesnac.common.model.Tool">
INSERT INTO Z_TOOL
<trim prefix="(" suffix=")" suffixOverrides=",">
HANDLE,
@ -291,7 +291,7 @@
</trim>
</insert>
<insert id="insertAllColumn" parameterType="com.foreverwin.mesnac.production.model.Tool">
<insert id="insertAllColumn" parameterType="com.foreverwin.mesnac.common.model.Tool">
INSERT INTO Z_TOOL
<trim prefix="(" suffix=")" suffixOverrides=",">
<include refid="Base_Column_List"></include>

6
console/src/main/resources/application-dev.yml
Unescape Escape View File

@ -9,7 +9,7 @@ spring:
jndi-name: jdbc/jts/wipPool
activemq:
enabled: false
brokerUrl: tcp://localhost:61616?wireFormat.maxInactivityDuration=0
brokerUrl: tcp://121.36.58.109:61616?wireFormat.maxInactivityDuration=0
password: admin
user: admin
pool:
@ -31,3 +31,7 @@ ftp:
username: zjw
password: zhaojiawei
#打印服务器配置
print:
server: http://localhost:8080/CodeSoftPrintWeb/printService

4
console/src/main/resources/application-local.yml
Unescape Escape View File

@ -10,8 +10,8 @@ spring:
password: wip
driver-class-name: oracle.jdbc.OracleDriver
activemq:
enabled: false
brokerUrl: tcp://localhost:61616?wireFormat.maxInactivityDuration=0
enabled: true
brokerUrl: tcp://121.36.58.109:61616?wireFormat.maxInactivityDuration=0
password: admin
user: admin
pool:

19
dataimport/src/main/java/com/foreverwin/mesnac/dataimport/client/NcGroupWSClient.java
Unescape Escape View File

@ -9,6 +9,8 @@ import com.sap.me.common.ObjectReference;
import com.sap.me.nonconformance.NcGroupConfigurationServiceInterface;
import com.sap.me.nonconformance.NcGroupFullConfiguration;
import com.sap.me.nonconformance.NcGroupValidOperation;
import com.visiprise.globalization.DateGlobalizationServiceInterface;
import com.visiprise.globalization.GlobalizationService;
import java.util.ArrayList;
import java.util.List;
@ -59,6 +61,7 @@ public class NcGroupWSClient {
String applyOperation = jsonObject.getString("applyOperation");
String ncGroupBo = HandleEnum.NC_GROUP.getHandle(site, ncGroup);
DateGlobalizationServiceInterface dateService = GlobalizationService.getInvariantService("com.visiprise.globalization.DateGlobalizationService");
//---------------------------------------------------------------------------------------------------
NcGroupConfigurationServiceInterface ncGroupConfigurationService = MEServices.create("com.sap.me.nonconformance", "NcGroupConfigurationService", site);
NcGroupFullConfiguration ncGroupFullConfiguration = new NcGroupFullConfiguration();
@ -79,10 +82,18 @@ public class NcGroupWSClient {
list.add(ncGroupValidOperation);
}
ncGroupFullConfiguration.setNcGroupValidOperationList(list);
} else if (StringUtil.notBlank(applyOperation)) {
List<NcGroupValidOperation> list = new ArrayList<>();
NcGroupValidOperation ncGroupValidOperation = new NcGroupValidOperation();
String operationBo = HandleEnum.OPERATION.getHandle(site, applyOperation, "#");
ncGroupValidOperation.setOperationRef(operationBo);
list.add(ncGroupValidOperation);
ncGroupFullConfiguration.setNcGroupValidOperationList(list);
}
}
ncGroupFullConfiguration.setModifiedDateTime(dateService.createDateTime());
ncGroupConfigurationService.createNcGroup(ncGroupFullConfiguration);
} catch (Exception e) {
return ExceptionUtil.getExceptionMsg(e);
@ -105,6 +116,7 @@ public class NcGroupWSClient {
String applyAll = jsonObject.getString("applyAll");
String applyOperation = jsonObject.getString("applyOperation");
DateGlobalizationServiceInterface dateService = GlobalizationService.getInvariantService("com.visiprise.globalization.DateGlobalizationService");
//---------------------------------------------------------------------------------------------------
NcGroupConfigurationServiceInterface ncGroupConfigurationService = MEServices.create("com.sap.me.nonconformance", "NcGroupConfigurationService", site);
ncGroupFullConfiguration.setDescription(description);
@ -122,6 +134,13 @@ public class NcGroupWSClient {
list.add(ncGroupValidOperation);
}
ncGroupFullConfiguration.setNcGroupValidOperationList(list);
} else if (StringUtil.notBlank(applyOperation)) {
List<NcGroupValidOperation> list = new ArrayList<>();
NcGroupValidOperation ncGroupValidOperation = new NcGroupValidOperation();
String operationBo = HandleEnum.OPERATION.getHandle(site, applyOperation, "#");
ncGroupValidOperation.setOperationRef(operationBo);
list.add(ncGroupValidOperation);
ncGroupFullConfiguration.setNcGroupValidOperationList(list);
}
}

26
dataimport/src/main/java/com/foreverwin/mesnac/dataimport/controller/DataImportController.java
Unescape Escape View File

@ -1,21 +1,17 @@
package com.foreverwin.mesnac.dataimport.controller;
import com.foreverwin.mesnac.anomaly.service.FileUploadedService;
import com.foreverwin.mesnac.dataimport.util.APResult;
import com.foreverwin.mesnac.dataimport.util.ImportRequest;
import com.foreverwin.mesnac.common.model.ExportTemplate;
import com.foreverwin.mesnac.common.service.ExportTemplateService;
import com.foreverwin.mesnac.dataimport.service.impl.MasterDataImportServiceImpl;
import com.foreverwin.mesnac.dataimport.util.APResult;
import com.foreverwin.mesnac.dataimport.util.ImportRequest;
import com.foreverwin.modular.core.util.CommonMethods;
import com.foreverwin.modular.core.util.R;
import com.foreverwin.modular.core.util.SpringUtil;
import com.sap.me.frame.Utils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.i18n.LocaleContextHolder;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.websocket.server.PathParam;
@ -31,26 +27,18 @@ public class DataImportController {
@Autowired
private MasterDataImportServiceImpl masterDataImportService;
@Autowired
FileUploadedService fileUploadedService;
@RequestMapping("/import")
public String importFile(@PathParam("fileType") String fileType, @PathParam("site") String site,
@PathParam("user") String user, @PathParam("handleType") final String handleType,
@PathParam("mode") final String mode, @RequestParam("file") MultipartFile multipartFile,@PathParam("taskNo")String taskNo) {
@PostMapping("/import")
public String importFile(@PathParam("fileType") String fileType, @PathParam("site") String site, @PathParam("user") String user, @PathParam("handleType") final String handleType, @PathParam("mode") final String mode, @RequestParam("file") MultipartFile multipartFile) {
ImportRequest importRequest = new ImportRequest();
importRequest.setFileType(fileType);
importRequest.setSite(site);
importRequest.setUser(user);
importRequest.setMode(mode);
importRequest.setMasterType(handleType);
//-----------------------------------------------------------------------------------------------------------------------------------------
try {
// String transInfo = masterDataImportService.importFile(multipartFile, importRequest);
fileUploadedService.uploadAttachment(multipartFile,site,taskNo,fileType);
return new APResult().getResult(0,"上传成功",null);
String transInfo = masterDataImportService.importFile(multipartFile, importRequest);
return new APResult().getResult(0, transInfo, transInfo);
} catch (Exception e) {
e.printStackTrace();
return new APResult().getResult(9999, e.getMessage(), e.getMessage());

2
dataimport/src/main/java/com/foreverwin/mesnac/dataimport/handler/HandlerFactory.java
Unescape Escape View File

@ -28,6 +28,8 @@ public class HandlerFactory {
return new InspectionItemHandler();
case "messageType" :
//return new MessageTypeHandler();
case "tool" :
return new ToolHandler();
}
return null;

38
dataimport/src/main/java/com/foreverwin/mesnac/dataimport/handler/InspectionItemHandler.java
Unescape Escape View File

@ -1,7 +1,7 @@
package com.foreverwin.mesnac.dataimport.handler;
import com.alibaba.fastjson.JSONObject;
import com.foreverwin.mesnac.dataimport.client.ResourceTypeWSClient;
import com.foreverwin.mesnac.common.service.InspectionItemService;
import com.foreverwin.mesnac.dataimport.handler.base.BaseHandler;
import com.foreverwin.mesnac.dataimport.reader.FileReader;
import com.foreverwin.mesnac.dataimport.reader.FileReaderBuilder;
@ -9,13 +9,14 @@ import com.foreverwin.mesnac.dataimport.reader.RowVisitor;
import com.foreverwin.mesnac.dataimport.service.MasterObjectDefine;
import com.foreverwin.modular.core.exception.BusinessException;
import com.foreverwin.modular.core.util.I18nUtil;
import com.sap.me.plant.ResourceTypeBasicConfiguration;
import org.springframework.beans.factory.annotation.Autowired;
import java.io.InputStream;
import java.util.Collection;
import java.util.Map;
public class InspectionItemHandler extends BaseHandler {
@Autowired
private InspectionItemService inspectionItemService;
@Override
public String importFile(String site, InputStream inputStream, String fileType, String mode) throws Exception {
@ -42,7 +43,7 @@ public class InspectionItemHandler extends BaseHandler {
@Override
public Map<String, String> getHeaders() {
return MasterObjectDefine.getHeadsMapping("RESOURCE_TYPE");
return MasterObjectDefine.getHeadsMapping("INSPECTION_ITEM");
}
public RowVisitor<JSONObject> getRowVisitor(String site, String mode, StringBuffer buffer, Integer[] failedNumber) {
@ -52,28 +53,19 @@ public class InspectionItemHandler extends BaseHandler {
public int visit(long index, JSONObject jsonObject) {
Object[] params = new Object[10];
params[0] = index;
params[1] = jsonObject.getString("resourceType");
String resultMessage = null;
try {
if (jsonObject.containsKey("resourceType") && jsonObject.getString("resourceType").trim().length() > 0) {
jsonObject.put("site", site);
Collection<ResourceTypeBasicConfiguration> collection = ResourceTypeWSClient.find(jsonObject);
if (collection.size() > 0) {
resultMessage = "资源类型主数据已经存在";
} else {
resultMessage = ResourceTypeWSClient.insert(jsonObject);
if (resultMessage == null) {
return 1;
}
}
if (resultMessage != null) {
params[2] = resultMessage;
failedNumber[0]++;
buffer.append("第" + index + "行：" + I18nUtil.getI18nText("MaterData.import.insert.fail", params) + "\n");
return 0;
}
jsonObject.put("site", site);
inspectionItemService.insert(jsonObject);
if (resultMessage == null) {
return 1;
}
if (resultMessage != null) {
params[2] = resultMessage;
failedNumber[0]++;
buffer.append("第" + index + "行：" + I18nUtil.getI18nText("MaterData.import.insert.fail", params) + "\n");
return 0;
}
return 0;
} catch (Exception e) {

80
dataimport/src/main/java/com/foreverwin/mesnac/dataimport/handler/ToolHandler.java
Unescape Escape View File

@ -0,0 +1,80 @@
package com.foreverwin.mesnac.dataimport.handler;
import com.alibaba.fastjson.JSONObject;
import com.foreverwin.mesnac.common.service.ToolService;
import com.foreverwin.mesnac.dataimport.handler.base.BaseHandler;
import com.foreverwin.mesnac.dataimport.reader.FileReader;
import com.foreverwin.mesnac.dataimport.reader.FileReaderBuilder;
import com.foreverwin.mesnac.dataimport.reader.RowVisitor;
import com.foreverwin.mesnac.dataimport.service.MasterObjectDefine;
import com.foreverwin.modular.core.exception.BusinessException;
import com.foreverwin.modular.core.util.I18nUtil;
import org.springframework.beans.factory.annotation.Autowired;
import java.io.InputStream;
import java.util.Map;
public class ToolHandler extends BaseHandler {
@Autowired
private ToolService toolService;
@Override
public String importFile(String site, InputStream inputStream, String fileType, String mode) throws Exception {
int row = 0;
StringBuffer buffer = new StringBuffer();
Integer[] failedNumber = new Integer[]{0};
try {
FileReader fileReader = new FileReaderBuilder().build(fileType);
RowVisitor<JSONObject> visitor = getRowVisitor(site, mode, buffer, failedNumber);
row = fileReader.visitor(visitor).read(inputStream, getHeaders());
} catch (Exception e) {
buffer.append(e.getMessage() + "\n");
}
if (buffer.length() > 0) {
buffer.insert(0, I18nUtil.getI18nText("MaterData.import.Summary", new Object[]{row + failedNumber[0], row, failedNumber[0]}) + "\n");
throw BusinessException.build(buffer.toString());
}
buffer.insert(0, I18nUtil.getI18nText("MaterData.import.Summary", new Object[]{row + failedNumber[0], row, failedNumber[0]}) + "\n");
return buffer.toString();
}
@Override
public Map<String, String> getHeaders() {
return MasterObjectDefine.getHeadsMapping("TOOL");
}
public RowVisitor<JSONObject> getRowVisitor(String site, String mode, StringBuffer buffer, Integer[] failedNumber) {
return new RowVisitor<JSONObject>() {
@Override
public int visit(long index, JSONObject jsonObject) {
Object[] params = new Object[10];
params[0] = index;
params[1] = jsonObject.getString("tool");
jsonObject.put("site", site);
try {
String msg = toolService.saveOrUpdateToolByImport(jsonObject, mode);
buffer.append("第" + index + "行：" + msg + "\n");
return 1;
} catch (Exception e) {
params[2] = e.getMessage();
failedNumber[0]++;
buffer.append("第" + index + "行：" + I18nUtil.getI18nText("MaterData.import.update.fail", params) + "\n");
}
return 0;
}
@Override
public String[] getHeader() {
return null;
}
};
}
}

72
dataimport/src/main/java/com/foreverwin/mesnac/dataimport/service/MasterObjectDefine.java
Unescape Escape View File

@ -39,13 +39,13 @@ public class MasterObjectDefine {
cvsHeadsMapping = new HashMap();
cvsHeadsMapping.put("seqNum", "序号");
cvsHeadsMapping.put("resource", "资源编码");
cvsHeadsMapping.put("description", "资源描述");
cvsHeadsMapping.put("resource", "*设备（资源）命名（英文）");
cvsHeadsMapping.put("description", "设备（资源）描述");
cvsHeadsMapping.put("defaultOperation", "默认操作");
cvsHeadsMapping.put("status", "资源状态" );
cvsHeadsMapping.put("status", "设备（资源）状态" );
cvsHeadsMapping.put("setupStatus", "设置状态");
cvsHeadsMapping.put("processResource", "工艺资源");
cvsHeadsMapping.put("resourceType", "资源类型");
cvsHeadsMapping.put("resourceType", "设备(资源)类型");
cvsHeadsMapping.put("validFrom", "资源有效期从");
cvsHeadsMapping.put("validTo", "资源有效期到");
cvsHeadsMapping.put("certificate", "证明编号");
@ -56,7 +56,7 @@ public class MasterObjectDefine {
cvsHeadsMapping = new HashMap();
cvsHeadsMapping.put("seqNum", "序号");
cvsHeadsMapping.put("workCenter", "工作中心名称");
cvsHeadsMapping.put("workCenter", "*工作中心名称(英文)");
cvsHeadsMapping.put("descriptionZH", "工作中心描述（中文）");
cvsHeadsMapping.put("descriptionEN", "工作中心描述（英文）");
cvsHeadsMapping.put("status", "状态");
@ -66,8 +66,8 @@ public class MasterObjectDefine {
cvsHeadsMapping.put("memberSeq", "序列号");
cvsHeadsMapping.put("memberType", "子工作中心类型");
cvsHeadsMapping.put("memberGBO", "工作中心或资源");
cvsHeadsMapping.put("ERPWC", "ERP工作中心");
cvsHeadsMapping.put("isERPWC", "是ERP工作中心");
cvsHeadsMapping.put("ERPWC", "ERP 工作中心");
cvsHeadsMapping.put("isERPWC", "是 ERP 工作中心");
break;
//工序主数据
@ -75,15 +75,15 @@ public class MasterObjectDefine {
cvsHeadsMapping = new HashMap();
cvsHeadsMapping.put("seqNum","序号");
cvsHeadsMapping.put("operation", "工序名称");
cvsHeadsMapping.put("version", "工序版本");
cvsHeadsMapping.put("operation", "*关键工序名称（英文）");
cvsHeadsMapping.put("version", "*关键工序版本");
cvsHeadsMapping.put("currentVersion", "当前版本(是/否)");
cvsHeadsMapping.put("status", "状态");
cvsHeadsMapping.put("descriptionZH", "工序描述（中文）");
cvsHeadsMapping.put("descriptionEN", "工序描述（英文）");
cvsHeadsMapping.put("operationType", "操作类型");
cvsHeadsMapping.put("resourceType", "资源类型");
cvsHeadsMapping.put("defaultResource", "默认资源");
cvsHeadsMapping.put("status", "*状态");
cvsHeadsMapping.put("descriptionZH", "关键工序描述（中文）");
cvsHeadsMapping.put("descriptionEN", "关键工序描述（英文）");
cvsHeadsMapping.put("operationType", "*操作类型");
cvsHeadsMapping.put("resourceType", "*设备（资源）类型");
cvsHeadsMapping.put("defaultResource", "默认设备（资源）");
break;
//不合格代码组
@ -143,17 +143,39 @@ public class MasterObjectDefine {
cvsHeadsMapping = new HashMap<>();
cvsHeadsMapping.put("seqNum","序号");
cvsHeadsMapping.put("seqNum","消息类型");
cvsHeadsMapping.put("seqNum","消息正文");
cvsHeadsMapping.put("seqNum","响应用户组");
cvsHeadsMapping.put("seqNum","响应用户组");
cvsHeadsMapping.put("seqNum","响应时间(H)");
cvsHeadsMapping.put("seqNum","响应超期上报用户组");
cvsHeadsMapping.put("seqNum","出具方案时间(H)");
cvsHeadsMapping.put("seqNum","方案关闭时通知用户组");
cvsHeadsMapping.put("seqNum","纠正预防措施用户组");
cvsHeadsMapping.put("seqNum","纠正预防措施时间");
cvsHeadsMapping.put("inspectionType","检验流程");
cvsHeadsMapping.put("inspectionItemNo","检验项目编号");
cvsHeadsMapping.put("description","检验项目描述");
cvsHeadsMapping.put("revision","版本");
cvsHeadsMapping.put("item","物料编码");
cvsHeadsMapping.put("operation","工序");
cvsHeadsMapping.put("resrceType","资源类型");
cvsHeadsMapping.put("paramNo","参数名称");
cvsHeadsMapping.put("paramDescription","参数描述");
cvsHeadsMapping.put("inspectionMethod","检验方法");
cvsHeadsMapping.put("paramType","数据类型");
cvsHeadsMapping.put("decimalNum","单位");
cvsHeadsMapping.put("paramUnit","小数位数");
cvsHeadsMapping.put("maxValue","规格上限");
cvsHeadsMapping.put("standardValue","目标规格");
cvsHeadsMapping.put("minValue","规格下限");
cvsHeadsMapping.put("falseValue","FALSE值");
cvsHeadsMapping.put("trueValue","TRUE值");
cvsHeadsMapping.put("isRequired","是否重要项目");
cvsHeadsMapping.put("checkNum","收集次数");
break;
//刀具
case "TOOL":
cvsHeadsMapping = new HashMap<>();
cvsHeadsMapping.put("tool","刀具");
cvsHeadsMapping.put("description","描述");
cvsHeadsMapping.put("specification","规格");
cvsHeadsMapping.put("brand","品牌");
cvsHeadsMapping.put("remark","备注");
break;
default:
break;
}

13
dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/CallItemController.java
Unescape Escape View File

@ -1,5 +1,6 @@
package com.foreverwin.mesnac.dispatch.controller;
import cn.hutool.core.date.DateUtil;
import com.foreverwin.mesnac.common.util.StringUtil;
import com.foreverwin.mesnac.dispatch.dto.IssueItemDto;
import com.foreverwin.modular.core.exception.BusinessException;
@ -41,6 +42,12 @@ public class CallItemController {
List<CallItem> result;
try {
callItem.setSite(CommonMethods.getSite());
if (callItem.getStartFromDate_S() != null) {
callItem.setStartFromDate(DateUtil.parse(callItem.getStartFromDate_S()));
}
if (callItem.getStartToDate_S() != null) {
callItem.setStartToDate(DateUtil.parse(callItem.getStartToDate_S()));
}
result = callItemService.findCallItemList(callItem);
} catch (Exception e) {
return R.failed(e.getMessage());
@ -61,6 +68,12 @@ public class CallItemController {
List<CallItem> result;
try {
callItem.setSite(CommonMethods.getSite());
if (callItem.getStartFromDate_S() != null) {
callItem.setStartFromDate(DateUtil.parse(callItem.getStartFromDate_S()));
}
if (callItem.getStartToDate_S() != null) {
callItem.setStartToDate(DateUtil.parse(callItem.getStartToDate_S()));
}
result = callItemService.findCallItemDetailList(callItem);
} catch (Exception e) {
return R.failed(e.getMessage());

144
dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/ItemBatchController.java
Unescape Escape View File

@ -1,5 +1,10 @@
package com.foreverwin.mesnac.dispatch.controller;
import com.foreverwin.mesnac.common.erp.ZprodordconfStruIn;
import com.foreverwin.mesnac.common.erp.ZprodordconfStruOut;
import com.foreverwin.mesnac.common.erp.holders.TableOfZprodordconfStruInHolder;
import com.foreverwin.mesnac.common.erp.holders.TableOfZprodordconfStruOutHolder;
import com.foreverwin.mesnac.common.util.ERPAPI;
import com.foreverwin.modular.core.util.R;
import com.foreverwin.modular.core.util.FrontPage;
import com.foreverwin.modular.core.util.CommonMethods;
@ -11,6 +16,8 @@ import org.springframework.web.bind.annotation.*;
import com.foreverwin.mesnac.dispatch.service.ItemBatchService;
import com.foreverwin.mesnac.dispatch.model.ItemBatch;
import java.math.BigDecimal;
import java.util.List;
/**
@ -25,103 +32,56 @@ public class ItemBatchController {
@Autowired
public ItemBatchService itemBatchService;
/**
* 根据id查询
*
* @param id 主键
* @return
*/
@ResponseBody
@GetMapping("/{id:.+}")
public R getItemBatchById(@PathVariable String id) {
return R.ok( itemBatchService.getById(id));
}
@GetMapping("/testErpJK")
public R testErpJK (String shopOrder, String stepId) {
/**
* 查询所有数据
*
* @return
*/
@ResponseBody
@GetMapping("")
public R getItemBatchList(ItemBatch itemBatch){
List<ItemBatch> result;
QueryWrapper<ItemBatch> queryWrapper = new QueryWrapper<>();
queryWrapper.setEntity(itemBatch);
result = itemBatchService.list(queryWrapper);
return R.ok(result);
}
try {
//请求参数
ZprodordconfStruIn[] ins = new ZprodordconfStruIn[1];
/**
* 分页查询数据
*
* @param frontPage 分页信息
* @return
*/
@ResponseBody
@GetMapping("/page")
public R page(FrontPage<ItemBatch> frontPage, ItemBatch itemBatch){
IPage result;
QueryWrapper<ItemBatch> queryWrapper = new QueryWrapper<>();
queryWrapper.setEntity(itemBatch);
if (frontPage.getGlobalQuery() != null && !"".equals(frontPage.getGlobalQuery().trim())) {
//TODO modify global query
queryWrapper.lambda().and(wrapper -> wrapper
.like(ItemBatch::getHandle, frontPage.getGlobalQuery())
.or().like(ItemBatch::getSite, frontPage.getGlobalQuery())
.or().like(ItemBatch::getFactory, frontPage.getGlobalQuery())
.or().like(ItemBatch::getItem, frontPage.getGlobalQuery())
.or().like(ItemBatch::getBatch, frontPage.getGlobalQuery())
.or().like(ItemBatch::getSupplier, frontPage.getGlobalQuery())
.or().like(ItemBatch::getLabel, frontPage.getGlobalQuery())
.or().like(ItemBatch::getIsPrint, frontPage.getGlobalQuery())
.or().like(ItemBatch::getCreateUser, frontPage.getGlobalQuery())
.or().like(ItemBatch::getModifyUser, frontPage.getGlobalQuery())
);
}
result = itemBatchService.page(frontPage.getPagePlus(), queryWrapper);
return R.ok(result);
}
ZprodordconfStruIn struIn = new ZprodordconfStruIn();
//生产订单
struIn.setAufnr(shopOrder);
//步骤标示
struIn.setVornr(stepId);
struIn.setAueru("1");
//良品数量
struIn.setLmnga(new BigDecimal(10));
//报废数量
struIn.setXmnga(new BigDecimal(1));
//机器工时
struIn.setIsm01(new BigDecimal(1));
//人工工时
struIn.setIsm02(new BigDecimal(1));
struIn.setIsm03(new BigDecimal(1));
struIn.setIsm04(new BigDecimal(1));
struIn.setIsm05(new BigDecimal(1));
struIn.setIsm06(new BigDecimal(1));
ins[0] = struIn;
TableOfZprodordconfStruInHolder inHolder = new TableOfZprodordconfStruInHolder(ins);
/**
* 新增
* @param itemBatch 传递的实体
* @return null 失败 实体成功
*/
@PostMapping
public R save(@RequestBody ItemBatch itemBatch) {
return R.ok(itemBatchService.save(itemBatch));
}
//返回对象
ZprodordconfStruOut[] outs = new ZprodordconfStruOut[1];
/**
* 修改
* @param itemBatch 传递的实体
* @return null 失败 实体成功
*/
@PutMapping
public R updateById(@RequestBody ItemBatch itemBatch) {
return R.ok(itemBatchService.updateById(itemBatch));
}
ZprodordconfStruOut struOut = new ZprodordconfStruOut();
struOut.setAufnr(shopOrder);
struOut.setVornr(stepId);
struOut.setAueru("1");
struOut.setLmnga(new BigDecimal(1));
struOut.setRet("");
struOut.setMsg("");
outs[0] = struOut;
TableOfZprodordconfStruOutHolder outHolder = new TableOfZprodordconfStruOutHolder(outs);
/**
* 根据id删除对象
* @param id 实体ID
* @return 0 失败 1 成功
*/
@ResponseBody
@RequestMapping(method = RequestMethod.DELETE, value = "/{id:.+}")
public R removeById(@PathVariable("id") String id){
return R.ok(itemBatchService.removeById(id));
}
//调用WS
ERPAPI.erpWebService().zmesProdordconf(inHolder, outHolder);
//状态： S|成功， E|失败
String status = outHolder.value[1].getRet();
String message = outHolder.value[1].getMsg();
/**
* 批量删除对象
* @param ids 实体集合ID
* @return 0 失败 1 成功
*/
@ResponseBody
@RequestMapping(method = RequestMethod.POST, value = "/delete-batch")
public R removeByIds(List<String> ids){
return R.ok(itemBatchService.removeByIds(ids));
return R.failed("ERP接口返回：状态:" + status + ",消息:" + message);
} catch (Exception e) {
return R.ok(e.getMessage());
}
}
}

3
dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/SfcDispatchController.java
Unescape Escape View File

@ -63,7 +63,7 @@ public class SfcDispatchController {
*/
@ResponseBody
@GetMapping("getSfcDispatch")
public R getSfcDispatch(String workCenter, String dispatchStatus, String item, String workOrder, String shopOrder,
public R getSfcDispatch(String workCenter, String dispatchStatus, String item, String itemNumber, String workOrder, String shopOrder,
String resrce, String resourceType, String operation, String sfc, String componentDescription, String turnOperation,
String isDispatch, String startFromDate_S, String startToDate_S, String completeFromDate_S, String completeToDate_S) {
List<ShopOrderRelease> list;
@ -73,6 +73,7 @@ public class SfcDispatchController {
shopOrderRelease.setWorkCenter(workCenter);
shopOrderRelease.setDispatchStatus(dispatchStatus);
shopOrderRelease.setItem(item);
shopOrderRelease.setItemNumber(itemNumber);
shopOrderRelease.setWorkOrder(workOrder);
shopOrderRelease.setShopOrder(shopOrder);
shopOrderRelease.setResrce(resrce);

4
dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/SurplusItemReturnController.java
Unescape Escape View File

@ -52,7 +52,7 @@ public class SurplusItemReturnController {
@ResponseBody
@GetMapping("/surplusReturn")
public R surplusReturn(String inventory, String length, String width, String qty) {
public R surplusReturn(String inventory, String length, String width, String numbers, String qty) {
try {
if (StringUtil.isBlank(inventory)) {
throw BusinessException.build("物料条码不能为空！");
@ -66,7 +66,7 @@ public class SurplusItemReturnController {
String site = CommonMethods.getSite();
String user = CommonMethods.getUser();
surplusItemReturnService.surplusReturn(site, user, inventory, length, width, new BigDecimal(qty));
surplusItemReturnService.surplusReturn(site, user, inventory, length, width, new BigDecimal(numbers), new BigDecimal(qty));
} catch (Exception e) {
return R.failed(e.getMessage());
}

3
dispatch/src/main/java/com/foreverwin/mesnac/dispatch/mapper/SurplusItemReturnMapper.java
Unescape Escape View File

@ -13,11 +13,12 @@ import java.util.Map;
* </p>
*
* @author Leon.L
* @since 2021-07-10
* @since 2021-07-15
*/
@Repository
public interface SurplusItemReturnMapper extends BaseMapper<SurplusItemReturn> {
/**
* 查询库存信息
*

92
dispatch/src/main/java/com/foreverwin/mesnac/dispatch/model/CallItem.java
Unescape Escape View File

@ -10,6 +10,8 @@ import java.math.BigDecimal;
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
/**
@ -150,6 +152,8 @@ public class CallItem extends Model<CallItem> {
@TableField(exist = false)
private String workOrder;
@TableField(exist = false)
private String itemNumber;
@TableField(exist = false)
private String workCenter;
@TableField(exist = false)
private String dispatchNo;
@ -165,6 +169,22 @@ public class CallItem extends Model<CallItem> {
private LocalDateTime plannedStartDate;
@TableField(exist = false)
private String remark;
@TableField(exist = false)
private String startFromDate_S;
@TableField(exist = false)
private String startToDate_S;
@TableField(exist = false)
private Date startFromDate;
@TableField(exist = false)
private Date startToDate;
@TableField(exist = false)
private String requireFromDate_S;
@TableField(exist = false)
private String requireToDate_S;
@TableField(exist = false)
private Date requireFromDate;
@TableField(exist = false)
private Date requireToDate;
public String getHandle() {
return handle;
@ -398,6 +418,14 @@ public class CallItem extends Model<CallItem> {
this.workOrder = workOrder;
}
public String getItemNumber() {
return itemNumber;
}
public void setItemNumber(String itemNumber) {
this.itemNumber = itemNumber;
}
public String getWorkCenter() {
return workCenter;
}
@ -462,6 +490,70 @@ public class CallItem extends Model<CallItem> {
this.remark = remark;
}
public String getStartFromDate_S() {
return startFromDate_S;
}
public void setStartFromDate_S(String startFromDate_S) {
this.startFromDate_S = startFromDate_S;
}
public String getStartToDate_S() {
return startToDate_S;
}
public void setStartToDate_S(String startToDate_S) {
this.startToDate_S = startToDate_S;
}
public Date getStartFromDate() {
return startFromDate;
}
public void setStartFromDate(Date startFromDate) {
this.startFromDate = startFromDate;
}
public Date getStartToDate() {
return startToDate;
}
public void setStartToDate(Date startToDate) {
this.startToDate = startToDate;
}
public String getRequireFromDate_S() {
return requireFromDate_S;
}
public void setRequireFromDate_S(String requireFromDate_S) {
this.requireFromDate_S = requireFromDate_S;
}
public String getRequireToDate_S() {
return requireToDate_S;
}
public void setRequireToDate_S(String requireToDate_S) {
this.requireToDate_S = requireToDate_S;
}
public Date getRequireFromDate() {
return requireFromDate;
}
public void setRequireFromDate(Date requireFromDate) {
this.requireFromDate = requireFromDate;
}
public Date getRequireToDate() {
return requireToDate;
}
public void setRequireToDate(Date requireToDate) {
this.requireToDate = requireToDate;
}
public static final String HANDLE = "HANDLE";
public static final String SITE = "SITE";

16
dispatch/src/main/java/com/foreverwin/mesnac/dispatch/model/ShopOrderRelease.java
Unescape Escape View File

@ -1,10 +1,6 @@
package com.foreverwin.mesnac.dispatch.model;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.foreverwin.mesnac.common.model.ExcelColumn;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.Date;
@ -49,6 +45,10 @@ public class ShopOrderRelease extends SfcDispatch {
* 工单自定义字段-工单备注
*/
private String comments;
/**
* 工单自定义字段-项目号
*/
private String itemNumber;
/**
* 工单自定义字段-工作令号
*/
@ -166,6 +166,14 @@ public class ShopOrderRelease extends SfcDispatch {
this.comments = comments;
}
public String getItemNumber() {
return itemNumber;
}
public void setItemNumber(String itemNumber) {
this.itemNumber = itemNumber;
}
public String getWorkOrder() {
return workOrder;
}

56
dispatch/src/main/java/com/foreverwin/mesnac/dispatch/model/SurplusItemReturn.java
Unescape Escape View File

@ -18,7 +18,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
* </p>
*
* @author Leon.L
* @since 2021-07-10
* @since 2021-07-15
*/
@TableName("Z_SURPLUS_ITEM_RETURN")
@ -61,6 +61,11 @@ public class SurplusItemReturn extends Model<SurplusItemReturn> {
*/
@TableField("WIDTH")
private String width;
/**
* 件数
*/
@TableField("NUMBERS")
private BigDecimal numbers;
/**
* 余料数量
*/
@ -79,8 +84,8 @@ public class SurplusItemReturn extends Model<SurplusItemReturn> {
/**
* 更新用户
*/
@TableField("MODIFU_USER")
private String modifuUser;
@TableField("MODIFY_USER")
private String modifyUser;
/**
* 更新时间
*/
@ -144,6 +149,14 @@ public class SurplusItemReturn extends Model<SurplusItemReturn> {
this.width = width;
}
public BigDecimal getNumbers() {
return numbers;
}
public void setNumbers(BigDecimal numbers) {
this.numbers = numbers;
}
public BigDecimal getQty() {
return qty;
}
@ -168,12 +181,12 @@ public class SurplusItemReturn extends Model<SurplusItemReturn> {
this.createdDateTime = createdDateTime;
}
public String getModifuUser() {
return modifuUser;
public String getModifyUser() {
return modifyUser;
}
public void setModifuUser(String modifuUser) {
this.modifuUser = modifuUser;
public void setModifyUser(String modifyUser) {
this.modifyUser = modifyUser;
}
public LocalDateTime getModifiedDateTime() {
@ -184,29 +197,31 @@ public class SurplusItemReturn extends Model<SurplusItemReturn> {
this.modifiedDateTime = modifiedDateTime;
}
public static final String HANDLE = "HANDLE";
public static final String HANDLE = "HANDLE";
public static final String SITE = "SITE";
public static final String SITE = "SITE";
public static final String INVENTORY = "INVENTORY";
public static final String INVENTORY = "INVENTORY";
public static final String PARENT_INVENTORY = "PARENT_INVENTORY";
public static final String PARENT_INVENTORY = "PARENT_INVENTORY";
public static final String ITEM_BO = "ITEM_BO";
public static final String ITEM_BO = "ITEM_BO";
public static final String LENGHT = "LENGHT";
public static final String LENGHT = "LENGHT";
public static final String WIDTH = "WIDTH";
public static final String WIDTH = "WIDTH";
public static final String NUMBERS = "NUMBERS";
public static final String QTY = "QTY";
public static final String QTY = "QTY";
public static final String CREATE_USER = "CREATE_USER";
public static final String CREATE_USER = "CREATE_USER";
public static final String CREATED_DATE_TIME = "CREATED_DATE_TIME";
public static final String CREATED_DATE_TIME = "CREATED_DATE_TIME";
public static final String MODIFU_USER = "MODIFU_USER";
public static final String MODIFY_USER = "MODIFY_USER";
public static final String MODIFIED_DATE_TIME = "MODIFIED_DATE_TIME";
public static final String MODIFIED_DATE_TIME = "MODIFIED_DATE_TIME";
@Override
@ -224,10 +239,11 @@ public static final String MODIFIED_DATE_TIME = "MODIFIED_DATE_TIME";
", itemBo = " + itemBo +
", lenght = " + lenght +
", width = " + width +
", numbers = " + numbers +
", qty = " + qty +
", createUser = " + createUser +
", createdDateTime = " + createdDateTime +
", modifuUser = " + modifuUser +
", modifyUser = " + modifyUser +
", modifiedDateTime = " + modifiedDateTime +
"}";
}

3
dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/SurplusItemReturnService.java
Unescape Escape View File

@ -36,7 +36,8 @@ public interface SurplusItemReturnService extends IService<SurplusItemReturn> {
* @param inventory
* @param length
* @param width
* @param numbers
* @param qty
*/
void surplusReturn(String site, String user, String inventory, String length, String width, BigDecimal qty);
void surplusReturn(String site, String user, String inventory, String length, String width, BigDecimal numbers, BigDecimal qty);
}

5
dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SurplusItemReturnServiceImpl.java
Unescape Escape View File

@ -82,7 +82,7 @@ public class SurplusItemReturnServiceImpl extends ServiceImpl<SurplusItemReturnM
}
@Override
public void surplusReturn(String site, String user, String inventory, String length, String width, BigDecimal qty) {
public void surplusReturn(String site, String user, String inventory, String length, String width, BigDecimal numbers, BigDecimal qty) {
String inventoryBo = HandleEnum.INVENTORY.getHandle(site, inventory);
Inventory inventoryModel = inventoryService.getById(inventoryBo);
if (inventoryModel == null) {
@ -144,10 +144,11 @@ public class SurplusItemReturnServiceImpl extends ServiceImpl<SurplusItemReturnM
surplusItemReturn.setLenght(length);
surplusItemReturn.setWidth(width);
surplusItemReturn.setItemBo(inventoryModel.getItemBo());
surplusItemReturn.setNumbers(numbers);
surplusItemReturn.setQty(qty);
surplusItemReturn.setCreateUser(user);
surplusItemReturn.setCreatedDateTime(dateTime);
surplusItemReturn.setModifuUser(user);
surplusItemReturn.setModifyUser(user);
surplusItemReturn.setModifiedDateTime(dateTime);
surplusItemReturnMapper.insert(surplusItemReturn);
}

122
dispatch/src/main/resources/mapper/CallItemMapper.xml
Unescape Escape View File

@ -34,6 +34,7 @@
<result column="EMPLOYEE" property="employee" />
<result column="SOURCE_RESOURCE" property="sourceResource" />
<result column="WORK_ORDER" property="workOrder" />
<result column="ITEM_NUMBER" property="itemNumber" />
<result column="WORK_CENTER" property="workCenter" />
<result column="DISPATCH_NO" property="dispatchNo" />
<result column="DISPATCH_QTY" property="dispatchQty" />
@ -629,54 +630,71 @@
</select>
<select id="findCallItemList" resultMap="FullResultMap">
SELECT ZCI.HANDLE, ZCI.SITE, CF.VALUE WORK_ORDER, ZSD.WORK_CENTER, ZSD.SHOP_ORDER, ZSD.SFC, ZSD.DISPATCH_NO, IT.ITEM, ITT.DESCRIPTION ITEM_DESCRIPTION, ZSD.BLANKING_SIZE,
ZSD.STEP_ID, ZCI.SFC_DISPATCH_BO, ZSD.DISPATCH_STATUS, ZCI.OPERATION, OPT.DESCRIPTION OPERATION_DESCRIPTION, ZSD.RESOURCE_TYPE, ZCI.RESRCE, ZSD.DISPATCH_QTY, ZSD.PLANNED_START_DATE, ZSD.REMARK,
CASE WHEN VP.NEWS = '1' AND VP.CALLES = '0' AND VP.ISSUED = '0' THEN N'未叫料'
WHEN VP.NEWS = '0' AND (VP.CALLES = '1' OR VP.ISSUED = '1') THEN N'全部推送'
ELSE N'部分推送' END CALL_STATUS,
CASE WHEN (VP.NEWS = '1' OR VP.CALLES = '1') AND VP.ISSUED = '0' THEN N'未发料'
WHEN VP.NEWS = '0' AND VP.CALLES = '0' AND VP.ISSUED = '1' THEN N'发料完成'
ELSE N'部分发料' END ISSUE_STATUS
FROM Z_SFC_DISPATCH ZSD
INNER JOIN Z_CALL_ITEM ZCI ON ZCI.SFC_DISPATCH_BO = ZSD.HANDLE
INNER JOIN SHOP_ORDER SO ON SO.SITE = ZSD.SITE AND ZSD.SHOP_ORDER = SO.SHOP_ORDER
LEFT JOIN CUSTOM_FIELDS CF ON CF.HANDLE = SO.HANDLE AND CF.ATTRIBUTE = 'WORK_ORDER'
INNER JOIN ITEM IT ON IT.HANDLE = SO.ITEM_BO
LEFT JOIN ITEM_T ITT ON ITT.ITEM_BO = IT.HANDLE AND ITT.LOCALE = 'zh'
INNER JOIN OPERATION OP ON OP.SITE = ZCI.SITE AND OP.OPERATION = ZCI.OPERATION AND OP.CURRENT_REVISION = 'true'
LEFT JOIN OPERATION_T OPT ON OPT.OPERATION_BO = OP.HANDLE AND OPT.LOCALE = 'zh'
LEFT JOIN (
SELECT SFC_DISPATCH_BO,
MAX(DECODE(STATUS, '801', '1', '0')) NEWS,
MAX(DECODE(STATUS, '802', '1', '0')) CALLES,
MAX(DECODE(STATUS, '803', '1', '0')) ISSUED,
MAX(DECODE(STATUS, '804', '1', '0')) CANCELED
FROM Z_CALL_ITEM
GROUP BY SFC_DISPATCH_BO
) VP ON VP.SFC_DISPATCH_BO = ZCI.SFC_DISPATCH_BO
WHERE ZSD.SITE = #{site}
<if test="workCenter != null and workCenter != ''">
AND ZSD.WORK_CENTER = #{workCenter}
</if>
<if test="dispatchStatus != null and dispatchStatus != ''">
AND ZSD.DISPATCH_STATUS = #{dispatchStatus}
</if>
<if test="workOrder != null and workOrder != ''">
AND CF.VALUE LIKE '%' ||#{workOrder}|| '%'
</if>
<if test="shopOrder != null and shopOrder != ''">
AND SO.SHOP_ORDER = #{shopOrder}
</if>
<if test="resourceType != null and resourceType != ''">
AND ZSD.RESOURCE_TYPE = #{resourceType}
SELECT *
FROM (
SELECT ZCI.SITE, CF.VALUE WORK_ORDER, CS.VALUE ITEM_NUMBER, ZSD.WORK_CENTER, ZSD.SHOP_ORDER, ZSD.SFC, ZSD.DISPATCH_NO, IT.ITEM, ITT.DESCRIPTION ITEM_DESCRIPTION, ZSD.BLANKING_SIZE,
ZSD.STEP_ID, ZCI.SFC_DISPATCH_BO, ZSD.DISPATCH_STATUS, ZCI.OPERATION, OPT.DESCRIPTION OPERATION_DESCRIPTION, ZSD.RESOURCE_TYPE, ZCI.RESRCE, ZSD.DISPATCH_QTY, ZSD.PLANNED_START_DATE, ZSD.REMARK,
CASE WHEN VP.NEWS = '1' AND VP.CALLES = '0' AND VP.ISSUED = '0' THEN 'NONE'
WHEN VP.NEWS = '0' AND (VP.CALLES = '1' OR VP.ISSUED = '1') THEN 'ALL'
ELSE 'PART' END CALL_STATUS,
CASE WHEN (VP.NEWS = '1' OR VP.CALLES = '1') AND VP.ISSUED = '0' THEN 'NONE'
WHEN VP.NEWS = '0' AND VP.CALLES = '0' AND VP.ISSUED = '1' THEN 'ALL'
ELSE 'ALL' END ISSUE_STATUS
FROM Z_SFC_DISPATCH ZSD
INNER JOIN Z_CALL_ITEM ZCI ON ZCI.SFC_DISPATCH_BO = ZSD.HANDLE
INNER JOIN SHOP_ORDER SO ON SO.SITE = ZSD.SITE AND ZSD.SHOP_ORDER = SO.SHOP_ORDER
LEFT JOIN CUSTOM_FIELDS CF ON CF.HANDLE = SO.HANDLE AND CF.ATTRIBUTE = 'WORK_ORDER'
LEFT JOIN CUSTOM_FIELDS CS ON CS.HANDLE = SO.HANDLE AND CS.ATTRIBUTE = 'ITEM_NUMBER'
INNER JOIN ITEM IT ON IT.HANDLE = SO.ITEM_BO
LEFT JOIN ITEM_T ITT ON ITT.ITEM_BO = IT.HANDLE AND ITT.LOCALE = 'zh'
INNER JOIN OPERATION OP ON OP.SITE = ZCI.SITE AND OP.OPERATION = ZCI.OPERATION AND OP.CURRENT_REVISION = 'true'
LEFT JOIN OPERATION_T OPT ON OPT.OPERATION_BO = OP.HANDLE AND OPT.LOCALE = 'zh'
LEFT JOIN (
SELECT SFC_DISPATCH_BO,
MAX(DECODE(STATUS, '801', '1', '0')) NEWS,
MAX(DECODE(STATUS, '802', '1', '0')) CALLES,
MAX(DECODE(STATUS, '803', '1', '0')) ISSUED,
MAX(DECODE(STATUS, '804', '1', '0')) CANCELED
FROM Z_CALL_ITEM
GROUP BY SFC_DISPATCH_BO
) VP ON VP.SFC_DISPATCH_BO = ZCI.SFC_DISPATCH_BO
WHERE ZSD.SITE = #{site}
<if test="workCenter != null and workCenter != ''">
AND ZSD.WORK_CENTER = #{workCenter}
</if>
<if test="dispatchStatus != null and dispatchStatus != ''">
AND ZSD.DISPATCH_STATUS = #{dispatchStatus}
</if>
<if test="workOrder != null and workOrder != ''">
AND CF.VALUE LIKE '%' ||#{workOrder}|| '%'
</if>
<if test="shopOrder != null and shopOrder != ''">
AND SO.SHOP_ORDER = #{shopOrder}
</if>
<if test="resourceType != null and resourceType != ''">
AND ZSD.RESOURCE_TYPE = #{resourceType}
</if>
<if test="resrce != null and resrce != ''">
AND ZCI.RESRCE = #{resrce}
</if>
<if test="startFromDate != null">
AND ZSD.PLANNED_START_DATE >= #{startFromDate}
</if>
<if test="startToDate != null">
AND ZSD.PLANNED_START_DATE &lt;= #{startToDate}
</if>
GROUP BY ZCI.SITE, CF.VALUE, CS.VALUE, ZSD.WORK_CENTER, ZSD.SHOP_ORDER, ZSD.SFC, ZSD.DISPATCH_NO, IT.ITEM, ITT.DESCRIPTION, ZSD.BLANKING_SIZE,
ZSD.STEP_ID, ZCI.SFC_DISPATCH_BO, ZSD.DISPATCH_STATUS, ZCI.OPERATION, OPT.DESCRIPTION, ZSD.RESOURCE_TYPE, ZCI.RESRCE, ZSD.DISPATCH_QTY, ZSD.PLANNED_START_DATE, ZSD.REMARK,
VP.NEWS, VP.CALLES, VP.ISSUED, VP.CANCELED
)
WHERE 1= 1
<if test="callStatus != null and callStatus != ''">
AND CALL_STATUS = #{callStatus}
</if>
<if test="resrce != null and resrce != ''">
AND ZCI.RESRCE = #{resrce}
<if test="issueStatus != null and issueStatus != ''">
AND ISSUE_STATUS = #{issueStatus}
</if>
GROUP BY ZCI.HANDLE, ZCI.SITE, CF.VALUE, ZSD.WORK_CENTER, ZSD.SHOP_ORDER, ZSD.SFC, ZSD.DISPATCH_NO, IT.ITEM, ITT.DESCRIPTION, ZSD.BLANKING_SIZE,
ZSD.STEP_ID, ZCI.SFC_DISPATCH_BO, ZSD.DISPATCH_STATUS, ZCI.OPERATION, OPT.DESCRIPTION, ZSD.RESOURCE_TYPE, ZCI.RESRCE, ZSD.DISPATCH_QTY, ZSD.PLANNED_START_DATE, ZSD.REMARK,
VP.NEWS, VP.CALLES, VP.ISSUED, VP.CANCELED
ORDER BY ZSD.SFC, ZSD.STEP_ID
ORDER BY SFC, STEP_ID
</select>
<select id="findCallItemDetailList" resultMap="FullResultMap">
@ -742,6 +760,18 @@
<if test="callType != null and callType != ''" >
AND ZCI.CALL_TYPE = #{callType}
</if>
<if test="startFromDate != null">
AND ZSD.PLANNED_START_DATE >= #{startFromDate}
</if>
<if test="startToDate != null">
AND ZSD.PLANNED_START_DATE &lt;= #{startToDate}
</if>
<if test="requireFromDate != null">
AND ZCI.REQUIRED_DATE_TIME >= #{requireFromDate}
</if>
<if test="requireToDate != null">
AND ZCI.REQUIRED_DATE_TIME &lt;= #{requireToDate}
</if>
ORDER BY ZSD.SFC, ZSD.STEP_ID, ZCI.CALL_TYPE
</select>

6
dispatch/src/main/resources/mapper/SfcDispatchMapper.xml
Unescape Escape View File

@ -998,7 +998,7 @@
WHEN WIP.DISPATCH_STATUS = 'PAUSE' THEN N'暂停' WHEN WIP.DISPATCH_STATUS = 'RELEASE' THEN N'发布'
END AS STATUS_NAME
FROM (
SELECT DISTINCT SD.HANDLE, SD.SITE, SD.SHOP_ORDER, SD.DISPATCH_NO, C1.VALUE WORK_ORDER, IM.HANDLE ITEM_BO, IM.ITEM, IT.DESCRIPTION ITEM_DESCRIPTION, SD.SFC, SD.DISPATCH_STATUS,
SELECT DISTINCT SD.HANDLE, SD.SITE, SD.SHOP_ORDER, SD.DISPATCH_NO, C2.VALUE ITEM_NUMBER, C1.VALUE WORK_ORDER, IM.HANDLE ITEM_BO, IM.ITEM, IT.DESCRIPTION ITEM_DESCRIPTION, SD.SFC, SD.DISPATCH_STATUS,
SD.STEP_ID, SD.OPERATION, OT.DESCRIPTION OPERATION_DESCRIPTION, SD.RESOURCE_TYPE, SD.RESRCE, SD.EMPLOYEE, SD.EMPLOYEE USER_NAME, SD.DISPATCH_QTY, SD.PROD_HOURS,
CASE WHEN OTHER_1 = 'true' THEN SD.DISPATCH_QTY ELSE 0 END COMPLETED_QTY, SD.PLANNED_START_DATE, SD.PLANNED_COMP_DATE, SD.WORK_CENTER, SD.IS_DISPATCH,
SD.ACTUAL_START_DATE, SD.ACTUAL_COMPLETE_DATE, SD.REMARK, SD.DISPATCH_SEQ, SD.DISPATCH_SEQ-1 BEFORE_SEQ, SD.DISPATCH_SEQ+1 AFTER_SEQ,
@ -1007,6 +1007,7 @@
FROM Z_SFC_DISPATCH SD
INNER JOIN SHOP_ORDER SO ON SO.SITE = SD.SITE AND SO.SHOP_ORDER = SD.SHOP_ORDER
LEFT JOIN CUSTOM_FIELDS C1 ON C1.HANDLE = SO.HANDLE AND C1."ATTRIBUTE" = 'WORK_ORDER'
LEFT JOIN CUSTOM_FIELDS C2 ON C2.HANDLE = SO.HANDLE AND C2."ATTRIBUTE" = 'ITEM_NUMBER'
INNER JOIN ITEM IM ON IM.HANDLE = SO.ITEM_BO
LEFT JOIN ITEM_T IT ON IT.ITEM_BO = IM.HANDLE AND IT.LOCALE = 'zh'
INNER JOIN OPERATION O ON O.SITE = SD.SITE AND O.OPERATION = SD.OPERATION AND O.CURRENT_REVISION = 'true'
@ -1027,6 +1028,9 @@
<if test="workOrder != null and workOrder != ''">
AND C1.VALUE LIKE '%' ||#{workOrder}|| '%'
</if>
<if test="itemNumber != null and itemNumber != ''">
AND C2.VALUE LIKE '%' ||#{itemNumber}|| '%'
</if>
<if test="shopOrder != null and shopOrder != ''">
AND SD.SHOP_ORDER = #{shopOrder}
</if>

50
dispatch/src/main/resources/mapper/SurplusItemReturnMapper.xml
Unescape Escape View File

@ -11,16 +11,17 @@
<result column="ITEM_BO" property="itemBo" />
<result column="LENGHT" property="lenght" />
<result column="WIDTH" property="width" />
<result column="NUMBERS" property="numbers" />
<result column="QTY" property="qty" />
<result column="CREATE_USER" property="createUser" />
<result column="CREATED_DATE_TIME" property="createdDateTime" />
<result column="MODIFU_USER" property="modifuUser" />
<result column="MODIFY_USER" property="modifyUser" />
<result column="MODIFIED_DATE_TIME" property="modifiedDateTime" />
</resultMap>
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
HANDLE, SITE, INVENTORY, PARENT_INVENTORY, ITEM_BO, LENGHT, WIDTH, QTY, CREATE_USER, CREATED_DATE_TIME, MODIFU_USER, MODIFIED_DATE_TIME
HANDLE, SITE, INVENTORY, PARENT_INVENTORY, ITEM_BO, LENGHT, WIDTH, NUMBERS, QTY, CREATE_USER, CREATED_DATE_TIME, MODIFY_USER, MODIFIED_DATE_TIME
</sql>
<!-- BaseMapper标准查询/修改/删除 -->
@ -61,10 +62,11 @@
<if test="ew.entity.itemBo!=null"> AND ITEM_BO=#{ew.entity.itemBo}</if>
<if test="ew.entity.lenght!=null"> AND LENGHT=#{ew.entity.lenght}</if>
<if test="ew.entity.width!=null"> AND WIDTH=#{ew.entity.width}</if>
<if test="ew.entity.numbers!=null"> AND NUMBERS=#{ew.entity.numbers}</if>
<if test="ew.entity.qty!=null"> AND QTY=#{ew.entity.qty}</if>
<if test="ew.entity.createUser!=null"> AND CREATE_USER=#{ew.entity.createUser}</if>
<if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
<if test="ew.entity.modifuUser!=null"> AND MODIFU_USER=#{ew.entity.modifuUser}</if>
<if test="ew.entity.modifyUser!=null"> AND MODIFY_USER=#{ew.entity.modifyUser}</if>
<if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
</where>
</select>
@ -83,10 +85,11 @@
<if test="ew.entity.itemBo!=null"> AND ITEM_BO=#{ew.entity.itemBo}</if>
<if test="ew.entity.lenght!=null"> AND LENGHT=#{ew.entity.lenght}</if>
<if test="ew.entity.width!=null"> AND WIDTH=#{ew.entity.width}</if>
<if test="ew.entity.numbers!=null"> AND NUMBERS=#{ew.entity.numbers}</if>
<if test="ew.entity.qty!=null"> AND QTY=#{ew.entity.qty}</if>
<if test="ew.entity.createUser!=null"> AND CREATE_USER=#{ew.entity.createUser}</if>
<if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
<if test="ew.entity.modifuUser!=null"> AND MODIFU_USER=#{ew.entity.modifuUser}</if>
<if test="ew.entity.modifyUser!=null"> AND MODIFY_USER=#{ew.entity.modifyUser}</if>
<if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
</if>
<if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
@ -113,10 +116,11 @@
<if test="ew.entity.itemBo!=null"> AND ITEM_BO=#{ew.entity.itemBo}</if>
<if test="ew.entity.lenght!=null"> AND LENGHT=#{ew.entity.lenght}</if>
<if test="ew.entity.width!=null"> AND WIDTH=#{ew.entity.width}</if>
<if test="ew.entity.numbers!=null"> AND NUMBERS=#{ew.entity.numbers}</if>
<if test="ew.entity.qty!=null"> AND QTY=#{ew.entity.qty}</if>
<if test="ew.entity.createUser!=null"> AND CREATE_USER=#{ew.entity.createUser}</if>
<if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
<if test="ew.entity.modifuUser!=null"> AND MODIFU_USER=#{ew.entity.modifuUser}</if>
<if test="ew.entity.modifyUser!=null"> AND MODIFY_USER=#{ew.entity.modifyUser}</if>
<if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
</if>
<if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
@ -143,10 +147,11 @@
<if test="ew.entity.itemBo!=null"> AND ITEM_BO=#{ew.entity.itemBo}</if>
<if test="ew.entity.lenght!=null"> AND LENGHT=#{ew.entity.lenght}</if>
<if test="ew.entity.width!=null"> AND WIDTH=#{ew.entity.width}</if>
<if test="ew.entity.numbers!=null"> AND NUMBERS=#{ew.entity.numbers}</if>
<if test="ew.entity.qty!=null"> AND QTY=#{ew.entity.qty}</if>
<if test="ew.entity.createUser!=null"> AND CREATE_USER=#{ew.entity.createUser}</if>
<if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
<if test="ew.entity.modifuUser!=null"> AND MODIFU_USER=#{ew.entity.modifuUser}</if>
<if test="ew.entity.modifyUser!=null"> AND MODIFY_USER=#{ew.entity.modifyUser}</if>
<if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
</if>
<if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
@ -173,10 +178,11 @@
<if test="ew.entity.itemBo!=null"> AND ITEM_BO=#{ew.entity.itemBo}</if>
<if test="ew.entity.lenght!=null"> AND LENGHT=#{ew.entity.lenght}</if>
<if test="ew.entity.width!=null"> AND WIDTH=#{ew.entity.width}</if>
<if test="ew.entity.numbers!=null"> AND NUMBERS=#{ew.entity.numbers}</if>
<if test="ew.entity.qty!=null"> AND QTY=#{ew.entity.qty}</if>
<if test="ew.entity.createUser!=null"> AND CREATE_USER=#{ew.entity.createUser}</if>
<if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
<if test="ew.entity.modifuUser!=null"> AND MODIFU_USER=#{ew.entity.modifuUser}</if>
<if test="ew.entity.modifyUser!=null"> AND MODIFY_USER=#{ew.entity.modifyUser}</if>
<if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
</if>
<if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
@ -203,10 +209,11 @@
<if test="ew.entity.itemBo!=null"> AND ITEM_BO=#{ew.entity.itemBo}</if>
<if test="ew.entity.lenght!=null"> AND LENGHT=#{ew.entity.lenght}</if>
<if test="ew.entity.width!=null"> AND WIDTH=#{ew.entity.width}</if>
<if test="ew.entity.numbers!=null"> AND NUMBERS=#{ew.entity.numbers}</if>
<if test="ew.entity.qty!=null"> AND QTY=#{ew.entity.qty}</if>
<if test="ew.entity.createUser!=null"> AND CREATE_USER=#{ew.entity.createUser}</if>
<if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
<if test="ew.entity.modifuUser!=null"> AND MODIFU_USER=#{ew.entity.modifuUser}</if>
<if test="ew.entity.modifyUser!=null"> AND MODIFY_USER=#{ew.entity.modifyUser}</if>
<if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
</if>
<if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
@ -233,10 +240,11 @@
<if test="ew.entity.itemBo!=null"> AND ITEM_BO=#{ew.entity.itemBo}</if>
<if test="ew.entity.lenght!=null"> AND LENGHT=#{ew.entity.lenght}</if>
<if test="ew.entity.width!=null"> AND WIDTH=#{ew.entity.width}</if>
<if test="ew.entity.numbers!=null"> AND NUMBERS=#{ew.entity.numbers}</if>
<if test="ew.entity.qty!=null"> AND QTY=#{ew.entity.qty}</if>
<if test="ew.entity.createUser!=null"> AND CREATE_USER=#{ew.entity.createUser}</if>
<if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
<if test="ew.entity.modifuUser!=null"> AND MODIFU_USER=#{ew.entity.modifuUser}</if>
<if test="ew.entity.modifyUser!=null"> AND MODIFY_USER=#{ew.entity.modifyUser}</if>
<if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
</if>
<if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
@ -259,10 +267,11 @@
<if test="itemBo!=null">ITEM_BO,</if>
<if test="lenght!=null">LENGHT,</if>
<if test="width!=null">WIDTH,</if>
<if test="numbers!=null">NUMBERS,</if>
<if test="qty!=null">QTY,</if>
<if test="createUser!=null">CREATE_USER,</if>
<if test="createdDateTime!=null">CREATED_DATE_TIME,</if>
<if test="modifuUser!=null">MODIFU_USER,</if>
<if test="modifyUser!=null">MODIFY_USER,</if>
<if test="modifiedDateTime!=null">MODIFIED_DATE_TIME,</if>
</trim> VALUES
<trim prefix="(" suffix=")" suffixOverrides=",">
@ -273,10 +282,11 @@
<if test="itemBo!=null">#{itemBo},</if>
<if test="lenght!=null">#{lenght},</if>
<if test="width!=null">#{width},</if>
<if test="numbers!=null">#{numbers},</if>
<if test="qty!=null">#{qty},</if>
<if test="createUser!=null">#{createUser},</if>
<if test="createdDateTime!=null">#{createdDateTime},</if>
<if test="modifuUser!=null">#{modifuUser},</if>
<if test="modifyUser!=null">#{modifyUser},</if>
<if test="modifiedDateTime!=null">#{modifiedDateTime},</if>
</trim>
</insert>
@ -294,10 +304,11 @@
#{itemBo},
#{lenght},
#{width},
#{numbers},
#{qty},
#{createUser},
#{createdDateTime},
#{modifuUser},
#{modifyUser},
#{modifiedDateTime},
</trim>
</insert>
@ -311,10 +322,11 @@
<if test="et.itemBo!=null">ITEM_BO=#{et.itemBo},</if>
<if test="et.lenght!=null">LENGHT=#{et.lenght},</if>
<if test="et.width!=null">WIDTH=#{et.width},</if>
<if test="et.numbers!=null">NUMBERS=#{et.numbers},</if>
<if test="et.qty!=null">QTY=#{et.qty},</if>
<if test="et.createUser!=null">CREATE_USER=#{et.createUser},</if>
<if test="et.createdDateTime!=null">CREATED_DATE_TIME=#{et.createdDateTime},</if>
<if test="et.modifuUser!=null">MODIFU_USER=#{et.modifuUser},</if>
<if test="et.modifyUser!=null">MODIFY_USER=#{et.modifyUser},</if>
<if test="et.modifiedDateTime!=null">MODIFIED_DATE_TIME=#{et.modifiedDateTime},</if>
</trim> WHERE HANDLE=#{et.handle} <if test="et instanceof java.util.Map"><if test="et.MP_OPTLOCK_VERSION_ORIGINAL!=null">and ${et.MP_OPTLOCK_VERSION_COLUMN}=#{et.MP_OPTLOCK_VERSION_ORIGINAL}</if></if>
</update>
@ -328,10 +340,11 @@
ITEM_BO=#{et.itemBo},
LENGHT=#{et.lenght},
WIDTH=#{et.width},
NUMBERS=#{et.numbers},
QTY=#{et.qty},
CREATE_USER=#{et.createUser},
CREATED_DATE_TIME=#{et.createdDateTime},
MODIFU_USER=#{et.modifuUser},
MODIFY_USER=#{et.modifyUser},
MODIFIED_DATE_TIME=#{et.modifiedDateTime},
</trim> WHERE HANDLE=#{et.handle} <if test="et instanceof java.util.Map"><if test="et.MP_OPTLOCK_VERSION_ORIGINAL!=null">and ${et.MP_OPTLOCK_VERSION_COLUMN}=#{et.MP_OPTLOCK_VERSION_ORIGINAL}</if></if>
</update>
@ -345,10 +358,11 @@
<if test="et.itemBo!=null">ITEM_BO=#{et.itemBo},</if>
<if test="et.lenght!=null">LENGHT=#{et.lenght},</if>
<if test="et.width!=null">WIDTH=#{et.width},</if>
<if test="et.numbers!=null">NUMBERS=#{et.numbers},</if>
<if test="et.qty!=null">QTY=#{et.qty},</if>
<if test="et.createUser!=null">CREATE_USER=#{et.createUser},</if>
<if test="et.createdDateTime!=null">CREATED_DATE_TIME=#{et.createdDateTime},</if>
<if test="et.modifuUser!=null">MODIFU_USER=#{et.modifuUser},</if>
<if test="et.modifyUser!=null">MODIFY_USER=#{et.modifyUser},</if>
<if test="et.modifiedDateTime!=null">MODIFIED_DATE_TIME=#{et.modifiedDateTime},</if>
</trim>
<where>
@ -361,10 +375,11 @@
<if test="ew.entity.itemBo!=null"> AND ITEM_BO=#{ew.entity.itemBo}</if>
<if test="ew.entity.lenght!=null"> AND LENGHT=#{ew.entity.lenght}</if>
<if test="ew.entity.width!=null"> AND WIDTH=#{ew.entity.width}</if>
<if test="ew.entity.numbers!=null"> AND NUMBERS=#{ew.entity.numbers}</if>
<if test="ew.entity.qty!=null"> AND QTY=#{ew.entity.qty}</if>
<if test="ew.entity.createUser!=null"> AND CREATE_USER=#{ew.entity.createUser}</if>
<if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
<if test="ew.entity.modifuUser!=null"> AND MODIFU_USER=#{ew.entity.modifuUser}</if>
<if test="ew.entity.modifyUser!=null"> AND MODIFY_USER=#{ew.entity.modifyUser}</if>
<if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
</if>
<if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
@ -408,10 +423,11 @@
<if test="ew.entity.itemBo!=null"> AND ITEM_BO=#{ew.entity.itemBo}</if>
<if test="ew.entity.lenght!=null"> AND LENGHT=#{ew.entity.lenght}</if>
<if test="ew.entity.width!=null"> AND WIDTH=#{ew.entity.width}</if>
<if test="ew.entity.numbers!=null"> AND NUMBERS=#{ew.entity.numbers}</if>
<if test="ew.entity.qty!=null"> AND QTY=#{ew.entity.qty}</if>
<if test="ew.entity.createUser!=null"> AND CREATE_USER=#{ew.entity.createUser}</if>
<if test="ew.entity.createdDateTime!=null"> AND CREATED_DATE_TIME=#{ew.entity.createdDateTime}</if>
<if test="ew.entity.modifuUser!=null"> AND MODIFU_USER=#{ew.entity.modifuUser}</if>
<if test="ew.entity.modifyUser!=null"> AND MODIFY_USER=#{ew.entity.modifyUser}</if>
<if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
</if>
<if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">

7
equip/src/main/java/com/foreverwin/mesnac/equip/consumer/ResourceMQConsume.java
Unescape Escape View File

@ -10,6 +10,7 @@ import org.springframework.jms.core.JmsMessagingTemplate;
import org.springframework.messaging.MessageHeaders;
import org.springframework.stereotype.Component;
import javax.jms.Queue;
/**
@ -38,14 +39,14 @@ public class ResourceMQConsume {
String resultString = resourceMQProcess.resourceStatusProcess(text);
//返回设备处理结果
//template.convertAndSend((Queue) headers.get("jms_replyTo"), resultString);
// template.convertAndSend((Queue) headers.get("jms_replyTo"), resultString);
}
@JmsListener(destination = "resource.alarm.process", containerFactory = "defaultFactory")
public void resourceAlarmProcess(String text, MessageHeaders headers) {
logger.info("接收设备报警数据：" + text);
resourceMQProcess.resourceFaultProcess(text);
//template.convertAndSend((Queue) headers.get("jms_replyTo"), "");
String resultString = resourceMQProcess.resourceFaultProcess(text);
// template.convertAndSend((Queue) headers.get("jms_replyTo"), resultString);
}
@JmsListener(destination = "resource.edc.process", containerFactory = "defaultFactory", concurrency = "5")

19
equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceInspectTaskServiceImpl.java
Unescape Escape View File

@ -1,32 +1,31 @@
package com.foreverwin.mesnac.equip.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.foreverwin.mesnac.common.constant.Constants;
import com.foreverwin.mesnac.common.enums.HandleEnum;
import com.foreverwin.mesnac.common.model.InspectionItemDetail;
import com.foreverwin.mesnac.common.service.InspectionItemDetailService;
import com.foreverwin.mesnac.equip.dto.ResourceInspectTaskDto;
import com.foreverwin.mesnac.equip.mapper.ResourceInspectTaskMapper;
import com.foreverwin.mesnac.equip.model.ResourceInspectPlan;
import com.foreverwin.mesnac.equip.model.ResourceInspectTask;
import com.foreverwin.mesnac.equip.model.ResourceInspectTaskParam;
import com.foreverwin.mesnac.equip.model.ResourceInspectTaskSpare;
import com.foreverwin.mesnac.equip.service.ResourceInspectPlanService;
import com.foreverwin.mesnac.equip.service.ResourceInspectTaskParamService;
import com.foreverwin.mesnac.equip.service.ResourceInspectTaskService;
import com.foreverwin.mesnac.equip.service.ResourceInspectTaskSpareService;
import com.foreverwin.modular.core.exception.BusinessException;
import com.foreverwin.modular.core.util.CommonMethods;
import com.foreverwin.modular.core.util.FrontPage;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.foreverwin.mesnac.equip.model.ResourceInspectTask;
import com.foreverwin.mesnac.equip.mapper.ResourceInspectTaskMapper;
import com.foreverwin.mesnac.equip.service.ResourceInspectTaskService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.UUID;
@ -268,8 +267,8 @@ public class ResourceInspectTaskServiceImpl extends ServiceImpl<ResourceInspectT
resourceInspectTaskParam.setParamUnit(detail.getParamUnit());
// 是否必填、最大最、最小值、标准值
resourceInspectTaskParam.setRequired(detail.getIsRequired());
resourceInspectTaskParam.setMaxValue(detail.getMaxValue());
resourceInspectTaskParam.setMinValue(detail.getMinValue());
resourceInspectTaskParam.setMaxValue(detail.getMaxValue().doubleValue());
resourceInspectTaskParam.setMinValue(detail.getMinValue().doubleValue());
resourceInspectTaskParam.setStandardValue(detail.getStandardValue());
resourceInspectTaskParam.setCreateUser("测试数据DEL");
resourceInspectTaskParam.setCreatedDateTime(LocalDateTime.now());

4
equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceRepairTaskServiceImpl.java
Unescape Escape View File

@ -81,11 +81,11 @@ public class ResourceRepairTaskServiceImpl extends ServiceImpl<ResourceRepairTas
throw BusinessException.build("设备编号错误！！！");
}
// 不良代码
String ncCOdeNo = resourceRepairTask.getNcCodeNo();
/*String ncCOdeNo = resourceRepairTask.getNcCodeNo();
String ncCodeHandle = HandleEnum.NC_CODE.getHandle(site, ncCOdeNo);
if ( ncCodeService.getById(ncCodeHandle) == null ){
throw BusinessException.build("不良代码错误！！！");
}
}*/
// 维修单号、维修HANDLE
List<String> nextNumber = nextNumberHelper.getNextNumber(site, Constants.RESOURCE_REPAIR_TASK, 1);
resourceRepairTask.setRepairNo(nextNumber.get(0));

8
generator/src/main/java/com/foreverwin/minth/generator/GeneratorApplication.java
Unescape Escape View File

@ -31,11 +31,11 @@ public class GeneratorApplication {
dataSourceConfig.setTypeConvert( new OracleTypeConvert() );
MpGenerator mpGenerator = mpGeneratorBuilder.dataSourceConfig(dataSourceConfig)
.tablePrefix( "APS_", "DS_", "Z_" )
.packageName( "com.foreverwin.mesnac.anomaly" )
.tables("Z_ABNORMAL_BILL")
.author("赵嘉伟")
.packageName( "com.foreverwin.mesnac.production" )
.tables("Z_CUTTER_LOG")
.author("Philip")
.uiAppId("com.foreverwin.me")
.uiPackage("com.foreverwin.me.migration")
.uiPackage("com.foreverwin.me.production")
.build();
mpGenerator.execute();
}

12
integration/src/main/java/com/foreverwin/mesnac/integration/config/IntegrationConfiguration.java
Unescape Escape View File

@ -1,6 +1,7 @@
package com.foreverwin.mesnac.integration.config;
import com.foreverwin.mesnac.integration.service.CAPPAPIWebService;
import com.foreverwin.mesnac.integration.service.ERPAPIWebService;
import org.apache.cxf.Bus;
import org.apache.cxf.jaxws.EndpointImpl;
@ -22,6 +23,8 @@ public class IntegrationConfiguration {
private Bus bus;
@Autowired
private ERPAPIWebService ERPAPIWebService;
@Autowired
private CAPPAPIWebService CAPPAPIWebService;
@Bean
public Endpoint erpWebService() {
@ -30,4 +33,13 @@ public class IntegrationConfiguration {
endpoint.publish("/ERPAPIWebService");
return endpoint;
}
@Bean
public Endpoint cappWebService() {
EndpointImpl endpoint = new EndpointImpl(bus, CAPPAPIWebService);
//显示要发布的名称
endpoint.publish("/CAPPAPIWebService");
return endpoint;
}
}

103
integration/src/main/java/com/foreverwin/mesnac/integration/dto/DisRouterStepDto.java
Unescape Escape View File

@ -0,0 +1,103 @@
package com.foreverwin.mesnac.integration.dto;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
@XmlAccessorType( XmlAccessType.FIELD )
@XmlType(name = "RouterStepDto", propOrder = {
"STEP_ID",
"OPERATION",
"OPERATION_DESCRIPTION",
"REVISION",
"RESRCE",
"PROD_TIME",
"OUT_SOURCE"
})
public class DisRouterStepDto {
@XmlElement(name = "STEP_ID")
private String STEP_ID;
@XmlElement(name = "OPERATION")
private String OPERATION;
@XmlElement(name = "OPERATION_DESCRIPTION")
private String OPERATION_DESCRIPTION;
@XmlElement(name = "REVISION")
private String REVISION;
@XmlElement(name = "RESRCE")
private String RESRCE;
@XmlElement(name = "PROD_TIME")
private String PROD_TIME;
@XmlElement(name = "OUT_SOURCE")
private String OUT_SOURCE;
public String getSTEP_ID() {
return STEP_ID;
}
public void setSTEP_ID(String STEP_ID) {
this.STEP_ID = STEP_ID;
}
public String getOPERATION() {
return OPERATION;
}
public void setOPERATION(String OPERATION) {
this.OPERATION = OPERATION;
}
public String getOPERATION_DESCRIPTION() {
return OPERATION_DESCRIPTION;
}
public void setOPERATION_DESCRIPTION(String OPERATION_DESCRIPTION) {
this.OPERATION_DESCRIPTION = OPERATION_DESCRIPTION;
}
public String getREVISION() {
return REVISION;
}
public void setREVISION(String REVISION) {
this.REVISION = REVISION;
}
public String getRESRCE() {
return RESRCE;
}
public void setRESRCE(String RESRCE) {
this.RESRCE = RESRCE;
}
public String getPROD_TIME() {
return PROD_TIME;
}
public void setPROD_TIME(String PROD_TIME) {
this.PROD_TIME = PROD_TIME;
}
public String getOUT_SOURCE() {
return OUT_SOURCE;
}
public void setOUT_SOURCE(String OUT_SOURCE) {
this.OUT_SOURCE = OUT_SOURCE;
}
@Override
public String toString() {
return "DisRouterStepDto{" +
"STEP_ID='" + STEP_ID + '\'' +
", OPERATION='" + OPERATION + '\'' +
", OPERATION_DESCRIPTION='" + OPERATION_DESCRIPTION + '\'' +
", REVISION='" + REVISION + '\'' +
", RESRCE='" + RESRCE + '\'' +
", PROD_TIME='" + PROD_TIME + '\'' +
", OUT_SOURCE='" + OUT_SOURCE + '\'' +
'}';
}
}

98
integration/src/main/java/com/foreverwin/mesnac/integration/dto/DisRouterSyncRequest.java
Unescape Escape View File

@ -0,0 +1,98 @@
package com.foreverwin.mesnac.integration.dto;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
import java.util.List;
/**
* 工艺路线同步接口请求参数类
*
* @author Leon
* @date 2021-6-24
*/
@XmlAccessorType( XmlAccessType.FIELD )
@XmlType(name = "DisRouterSyncRequest", propOrder = {
"TRANID",
"DATE_TIME",
"SITE",
"FACTORY",
"ROUTER",
"OPERATION_LIST"
})
public class DisRouterSyncRequest {
@XmlElement(name = "TRANID")
private String TRANID;
@XmlElement(name = "DATE_TIME")
private String DATE_TIME;
@XmlElement(name = "SITE")
private String SITE;
@XmlElement(name = "FACTORY")
private String FACTORY;
@XmlElement(name = "ROUTER")
private String ROUTER;
@XmlElement(name = "OPERATION_LIST")
private List<DisRouterStepDto> OPERATION_LIST;
public String getTRANID() {
return TRANID;
}
public void setTRANID(String TRANID) {
this.TRANID = TRANID;
}
public String getDATE_TIME() {
return DATE_TIME;
}
public void setDATE_TIME(String DATE_TIME) {
this.DATE_TIME = DATE_TIME;
}
public String getSITE() {
return SITE;
}
public void setSITE(String SITE) {
this.SITE = SITE;
}
public String getFACTORY() {
return FACTORY;
}
public void setFACTORY(String FACTORY) {
this.FACTORY = FACTORY;
}
public String getROUTER() {
return ROUTER;
}
public void setROUTER(String ROUTER) {
this.ROUTER = ROUTER;
}
public List<DisRouterStepDto> getOPERATION_LIST() {
return OPERATION_LIST;
}
public void setOPERATION_LIST(List<DisRouterStepDto> OPERATION_LIST) {
this.OPERATION_LIST = OPERATION_LIST;
}
@Override
public String toString() {
return "DisRouterSyncRequest{" +
"TRANID='" + TRANID + '\'' +
", DATE_TIME='" + DATE_TIME + '\'' +
", SITE='" + SITE + '\'' +
", FACTORY='" + FACTORY + '\'' +
", ROUTER='" + ROUTER + '\'' +
", OPERATION_LIST=" + OPERATION_LIST +
'}';
}
}

282
integration/src/main/java/com/foreverwin/mesnac/integration/dto/ItemSyncRequest.java
Unescape Escape View File

@ -0,0 +1,282 @@
package com.foreverwin.mesnac.integration.dto;
import com.sap.me.common.ItemType;
import com.sap.me.common.MaterialType;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
@XmlAccessorType( XmlAccessType.FIELD )
@XmlType(name = "ItemSyncRequest", propOrder = {
"TRANID",
"DATE_TIME",
"SITE",
"ITEM",
"REVISION",
"MAKTX",
"STATUS",
"ITEM_TYPE",
"PROCUREMENT_TYPE",
"LOT_SIZE",
"UNIT_OF_MEASURE",
"ASSY_DATA_TYPE",
"INV_ASSY_DATA_TYPE",
"INGRED_TYPE",
"WEIGHT",
"MAT_SPEC",
"MODEL",
"TEXTURE",
"DRAWING",
"DRAWING_REVISION"
})
public class ItemSyncRequest {
@XmlElement(name = "TRANID")
private String TRANID;
@XmlElement(name = "DATE_TIME")
private String DATE_TIME;
@XmlElement(name = "SITE")
private String SITE;
//物料编号
@XmlElement(name = "ITEM")
private String ITEM;
//物料版本：默认为A
@XmlElement(name = "REVISION")
private String REVISION;
//物料描述
@XmlElement(name = "MAKTX")
private String MAKTX;
//状态
@XmlElement(name = "STATUS")
private String STATUS;
//物料类型
@XmlElement(name = "ITEM_TYPE")
private String ITEM_TYPE;
//采购类型
@XmlElement(name = "PROCUREMENT_TYPE")
private String PROCUREMENT_TYPE;
//批次大小
@XmlElement(name = "LOT_SIZE")
private String LOT_SIZE;
//单位
@XmlElement(name = "UNIT_OF_MEASURE")
private String UNIT_OF_MEASURE;
@XmlElement(name = "ASSY_DATA_TYPE")
private String ASSY_DATA_TYPE;
@XmlElement(name = "INV_ASSY_DATA_TYPE")
private String INV_ASSY_DATA_TYPE;
//辅料类型：0或者空则不是辅料，刀具-1，其他-9
@XmlElement(name = "INGRED_TYPE")
private String INGRED_TYPE;
//重量
@XmlElement(name = "WEIGHT")
private String WEIGHT;
//规格
@XmlElement(name = "MAT_SPEC")
private String MAT_SPEC;
//型号
@XmlElement(name = "MODEL")
private String MODEL;
//材质
@XmlElement(name = "TEXTURE")
private String TEXTURE;
//图号
@XmlElement(name = "DRAWING")
private String DRAWING;
//图号版本
@XmlElement(name = "DRAWING_REVISION")
private String DRAWING_REVISION;
public String getTRANID() {
return TRANID;
}
public void setTRANID(String TRANID) {
this.TRANID = TRANID;
}
public String getDATE_TIME() {
return DATE_TIME;
}
public void setDATE_TIME(String DATE_TIME) {
this.DATE_TIME = DATE_TIME;
}
public String getSITE() {
return SITE;
}
public void setSITE(String SITE) {
this.SITE = SITE;
}
public String getITEM() {
return ITEM;
}
public void setITEM(String ITEM) {
this.ITEM = ITEM;
}
public String getREVISION() {
return REVISION;
}
public void setREVISION(String REVISION) {
this.REVISION = REVISION;
}
public String getMAKTX() {
return MAKTX;
}
public void setMAKTX(String MAKTX) {
this.MAKTX = MAKTX;
}
public String getSTATUS() {
return STATUS;
}
public void setSTATUS(String STATUS) {
this.STATUS = STATUS;
}
public String getITEM_TYPE() {
return ITEM_TYPE;
}
public void setITEM_TYPE(String ITEM_TYPE) {
this.ITEM_TYPE = ITEM_TYPE;
}
public String getPROCUREMENT_TYPE() {
return PROCUREMENT_TYPE;
}
public void setPROCUREMENT_TYPE(String PROCUREMENT_TYPE) {
this.PROCUREMENT_TYPE = PROCUREMENT_TYPE;
}
public String getLOT_SIZE() {
return LOT_SIZE;
}
public void setLOT_SIZE(String LOT_SIZE) {
this.LOT_SIZE = LOT_SIZE;
}
public String getUNIT_OF_MEASURE() {
return UNIT_OF_MEASURE;
}
public void setUNIT_OF_MEASURE(String UNIT_OF_MEASURE) {
this.UNIT_OF_MEASURE = UNIT_OF_MEASURE;
}
public String getASSY_DATA_TYPE() {
return ASSY_DATA_TYPE;
}
public void setASSY_DATA_TYPE(String ASSY_DATA_TYPE) {
this.ASSY_DATA_TYPE = ASSY_DATA_TYPE;
}
public String getINV_ASSY_DATA_TYPE() {
return INV_ASSY_DATA_TYPE;
}
public void setINV_ASSY_DATA_TYPE(String INV_ASSY_DATA_TYPE) {
this.INV_ASSY_DATA_TYPE = INV_ASSY_DATA_TYPE;
}
public String getINGRED_TYPE() {
return INGRED_TYPE;
}
public void setINGRED_TYPE(String INGRED_TYPE) {
this.INGRED_TYPE = INGRED_TYPE;
}
public String getWEIGHT() {
return WEIGHT;
}
public void setWEIGHT(String WEIGHT) {
this.WEIGHT = WEIGHT;
}
public String getMAT_SPEC() {
return MAT_SPEC;
}
public void setMAT_SPEC(String MAT_SPEC) {
this.MAT_SPEC = MAT_SPEC;
}
public String getMODEL() {
return MODEL;
}
public void setMODEL(String MODEL) {
this.MODEL = MODEL;
}
public String getTEXTURE() {
return TEXTURE;
}
public void setTEXTURE(String TEXTURE) {
this.TEXTURE = TEXTURE;
}
public String getDRAWING() {
return DRAWING;
}
public void setDRAWING(String DRAWING) {
this.DRAWING = DRAWING;
}
public String getDRAWING_REVISION() {
return DRAWING_REVISION;
}
public void setDRAWING_REVISION(String DRAWING_REVISION) {
this.DRAWING_REVISION = DRAWING_REVISION;
}
@Override
public String toString() {
return "ItemSyncRequest{" +
"TRANID='" + TRANID + '\'' +
", DATE_TIME='" + DATE_TIME + '\'' +
", SITE='" + SITE + '\'' +
", ITEM='" + ITEM + '\'' +
", REVISION='" + REVISION + '\'' +
", MAKTX='" + MAKTX + '\'' +
", STATUS='" + STATUS + '\'' +
", ITEM_TYPE='" + ITEM_TYPE + '\'' +
", PROCUREMENT_TYPE='" + PROCUREMENT_TYPE + '\'' +
", LOT_SIZE='" + LOT_SIZE + '\'' +
", UNIT_OF_MEASURE='" + UNIT_OF_MEASURE + '\'' +
", ASSY_DATA_TYPE='" + ASSY_DATA_TYPE + '\'' +
", INV_ASSY_DATA_TYPE='" + INV_ASSY_DATA_TYPE + '\'' +
", INGRED_TYPE='" + INGRED_TYPE + '\'' +
", WEIGHT='" + WEIGHT + '\'' +
", MAT_SPEC='" + MAT_SPEC + '\'' +
", MODEL='" + MODEL + '\'' +
", TEXTURE='" + TEXTURE + '\'' +
", DRAWING='" + DRAWING + '\'' +
", DRAWING_REVISION='" + DRAWING_REVISION + '\'' +
'}';
}
}

4
integration/src/main/java/com/foreverwin/mesnac/integration/dto/RouterStepDto.java
Unescape Escape View File

@ -16,9 +16,9 @@ import java.math.BigDecimal;
})
public class RouterStepDto {
@XmlElement(name = "STEP_ID", required = true)
@XmlElement(name = "STEP_ID")
private String STEP_ID;
@XmlElement(name = "OPERATION", required = true)
@XmlElement(name = "OPERATION")
private String OPERATION;
@XmlElement(name = "REVISION")
private String REVISION;

32
integration/src/main/java/com/foreverwin/mesnac/integration/service/CAPPAPIWebService.java
Unescape Escape View File

@ -0,0 +1,32 @@
package com.foreverwin.mesnac.integration.service;
import com.foreverwin.mesnac.integration.dto.DisRouterSyncRequest;
import com.foreverwin.mesnac.integration.dto.ItemSyncRequest;
import com.foreverwin.mesnac.integration.dto.RouterSyncRequest;
import com.foreverwin.mesnac.integration.dto.WebServiceResponse;
import javax.jws.WebMethod;
import javax.jws.WebParam;
import javax.jws.WebService;
@WebService(targetNamespace="http://service.integration.mesnac.com")
public interface CAPPAPIWebService {
/**
* 物料清单同步
*
* @param itemSyncRequest
* @return
*/
@WebMethod(action = "http://service.integration.mesnac.com/itemSync")
WebServiceResponse itemSync(@WebParam(name = "itemSyncRequest") ItemSyncRequest itemSyncRequest);
/**
* 返工工艺路线同步
*
* @param disRouterSyncRequest
* @return
*/
@WebMethod(action = "http://service.integration.mesnac.com/disRouterSync")
WebServiceResponse disRouterSync(@WebParam(name = "disRouterSyncRequest") DisRouterSyncRequest disRouterSyncRequest);
}

20
integration/src/main/java/com/foreverwin/mesnac/integration/service/InterfaceService.java
Unescape Escape View File

@ -1,20 +1,26 @@
package com.foreverwin.mesnac.integration.service;
import com.alibaba.fastjson.JSONObject;
import com.foreverwin.mesnac.integration.dto.BomSyncRequest;
import com.foreverwin.mesnac.integration.dto.ItemBatchReceiveRequest;
import com.foreverwin.mesnac.integration.dto.RouterSyncRequest;
import com.foreverwin.mesnac.integration.dto.ShopOrderSyncRequest;
import com.foreverwin.mesnac.integration.dto.*;
public interface InterfaceService {
/**
* 物料创建或者更新
*
* @param jsonObject
* @param itemSyncRequest
* @throws Exception
*/
void createOrUpdateItem(JSONObject jsonObject) throws Exception;
void itemSync(String site, ItemSyncRequest itemSyncRequest) throws Exception;
/**
* 工艺路线同步
*
* @param site
* @param disRouterSyncRequest
* @throws Exception
*/
void disRouterSync(String site, DisRouterSyncRequest disRouterSyncRequest) throws Exception;
/**
* 物料清单同步

147
integration/src/main/java/com/foreverwin/mesnac/integration/service/impl/CAPPAPIWebServiceImpl.java
Unescape Escape View File

@ -0,0 +1,147 @@
package com.foreverwin.mesnac.integration.service.impl;
import com.foreverwin.mesnac.common.constant.IntegrationTypeConstant;
import com.foreverwin.mesnac.common.util.ExceptionUtil;
import com.foreverwin.mesnac.common.util.StringUtil;
import com.foreverwin.mesnac.integration.dto.DisRouterSyncRequest;
import com.foreverwin.mesnac.integration.dto.ItemSyncRequest;
import com.foreverwin.mesnac.integration.dto.RouterSyncRequest;
import com.foreverwin.mesnac.integration.dto.WebServiceResponse;
import com.foreverwin.mesnac.integration.model.IntegrationLog;
import com.foreverwin.mesnac.integration.service.CAPPAPIWebService;
import com.foreverwin.mesnac.integration.service.IntegrationLogService;
import com.foreverwin.mesnac.integration.service.InterfaceService;
import com.foreverwin.modular.core.exception.BusinessException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import javax.jws.WebService;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.UUID;
@Component
@WebService(serviceName = "CAPPAPIWebService",
targetNamespace = "http://service.integration.mesnac.com",
endpointInterface = "com.foreverwin.mesnac.integration.service.CAPPAPIWebService")
public class CAPPAPIWebServiceImpl implements CAPPAPIWebService {
@Autowired
private InterfaceService interfaceService;
@Autowired
private IntegrationLogService integrationLogService;
@Override
public WebServiceResponse itemSync(ItemSyncRequest itemSyncRequest) {
WebServiceResponse response = new WebServiceResponse();
String site = null;
try {
if (itemSyncRequest == null) {
throw BusinessException.build("传递的参数格式不正确，或者为空");
}
if (StringUtil.isBlank(itemSyncRequest.getTRANID())) {
throw BusinessException.build("参数【TRANID】不能为空");
}
if (StringUtil.isBlank(itemSyncRequest.getDATE_TIME())) {
throw BusinessException.build("参数【DATE_TIME】不能为空");
}
response.setHANDLE(itemSyncRequest.getTRANID());
response.setSTATUS("S");
site = itemSyncRequest.getSITE();
String item = itemSyncRequest.getITEM();
if (StringUtil.isBlank(site)) {
throw BusinessException.build("参数【SITE】不能为空");
}
if (StringUtil.isBlank(item)) {
throw BusinessException.build("参数【ITEM】不能为空");
}
//调用业务接口
interfaceService.itemSync(site, itemSyncRequest);
response.setMESSAGE("物料【" + item + "】数据同步成功");
} catch (Exception e) {
response.setSTATUS("E");
response.setMESSAGE(ExceptionUtil.getExceptionMsg(e));
} finally {
//记录接口日志
IntegrationLog log = new IntegrationLog();
log.setHandle(UUID.randomUUID().toString());
log.setSite(site);
log.setIntegrationType(IntegrationTypeConstant.ITEM);
log.setCategory("RESPONSE");
log.setIntegrationWay("CAPP");
log.setIntegrationMethod("InterfaceService.itemSync");
log.setParam(itemSyncRequest.toString());
log.setStatus(response.getSTATUS());
log.setResultMessage(response.getMESSAGE());
log.setTransactionId(itemSyncRequest.getTRANID());
log.setRequestDateTime(LocalDateTime.parse(itemSyncRequest.getDATE_TIME(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
log.setCreatedDateTime(LocalDateTime.now());
integrationLogService.saveIntegrationLog(log);
}
//接口返回
return response;
}
@Override
public WebServiceResponse disRouterSync(DisRouterSyncRequest disRouterSyncRequest) {
WebServiceResponse response = new WebServiceResponse();
String site = null;
try {
if (disRouterSyncRequest == null) {
throw BusinessException.build("传递的参数格式不正确，或者为空");
}
if (StringUtil.isBlank(disRouterSyncRequest.getTRANID())) {
throw BusinessException.build("参数【TRANID】不能为空");
}
if (StringUtil.isBlank(disRouterSyncRequest.getDATE_TIME())) {
throw BusinessException.build("参数【DATE_TIME】不能为空");
}
response.setHANDLE(disRouterSyncRequest.getTRANID());
response.setSTATUS("S");
site = disRouterSyncRequest.getSITE();
String router = disRouterSyncRequest.getROUTER();
if (StringUtil.isBlank(site)) {
throw BusinessException.build("参数【SITE】不能为空");
}
if (StringUtil.isBlank(router)) {
throw BusinessException.build("参数【ROUTER】不能为空");
}
//调用业务接口
interfaceService.disRouterSync(site, disRouterSyncRequest);
response.setMESSAGE("返工工艺路线【" + router + "】同步成功");
} catch (Exception e) {
response.setSTATUS("E");
response.setMESSAGE(ExceptionUtil.getExceptionMsg(e));
} finally {
//记录接口日志
IntegrationLog log = new IntegrationLog();
log.setHandle(UUID.randomUUID().toString());
log.setSite(site);
log.setIntegrationType(IntegrationTypeConstant.DIS_ROUTER);
log.setCategory("RESPONSE");
log.setIntegrationWay("CAPP");
log.setIntegrationMethod("InterfaceService.disRouterSync");
log.setParam(disRouterSyncRequest.toString());
log.setStatus(response.getSTATUS());
log.setResultMessage(response.getMESSAGE());
log.setTransactionId(disRouterSyncRequest.getTRANID());
log.setRequestDateTime(LocalDateTime.parse(disRouterSyncRequest.getDATE_TIME(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
log.setCreatedDateTime(LocalDateTime.now());
integrationLogService.saveIntegrationLog(log);
}
//接口返回
return response;
}
}

308
integration/src/main/java/com/foreverwin/mesnac/integration/service/impl/InterfaceServiceImpl.java
Unescape Escape View File

@ -1,8 +1,8 @@
package com.foreverwin.mesnac.integration.service.impl;
import com.alibaba.fastjson.JSONObject;
import com.foreverwin.mesnac.common.constant.Constants;
import com.foreverwin.mesnac.common.constant.CustomFieldConstant;
import com.foreverwin.mesnac.common.constant.DataImportConstant;
import com.foreverwin.mesnac.common.enums.HandleEnum;
import com.foreverwin.mesnac.common.util.StringUtil;
import com.foreverwin.mesnac.dispatch.model.ItemBatch;
@ -19,13 +19,9 @@ import com.sap.me.common.ObjectReference;
import com.sap.me.common.ProcurementType;
import com.sap.me.demand.*;
import com.sap.me.productdefinition.*;
import com.sap.me.production.ChangeProductionContext;
import com.sap.me.production.ChangeProductionRequest;
import com.sap.me.production.ChangeProductionServiceInterface;
import com.sap.me.production.OperationPlacementTypeEnum;
import com.visiprise.globalization.DateGlobalizationServiceInterface;
import com.visiprise.globalization.GlobalizationService;
import com.visiprise.globalization.util.DateTimeInterface;
import com.visiprise.model.BOMType;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.i18n.LocaleContextHolder;
@ -52,12 +48,12 @@ public class InterfaceServiceImpl implements InterfaceService {
@Autowired
private BomService bomService;
@Autowired
private SfcService sfcService;
@Autowired
private ItemService itemService;
@Autowired
private RouterService routerService;
@Autowired
private ResrceService resrceService;
@Autowired
private ShopOrderService shopOrderService;
@Autowired
private ItemBatchService itemBatchService;
@ -68,37 +64,38 @@ public class InterfaceServiceImpl implements InterfaceService {
@Override
public void createOrUpdateItem(JSONObject jsonObject) throws Exception{
//数据主键
String site = jsonObject.getString("SITE");
public void itemSync(String site, ItemSyncRequest itemSyncRequest) throws Exception{
//物料
String item = jsonObject.getString("ITEM");
String item = itemSyncRequest.getITEM();
//版本:默认值A
String revision = jsonObject.getString("REVISION");
String revision = itemSyncRequest.getREVISION();
revision = StringUtil.notBlank(revision) ? revision : "A";
//物料描述
String itemDescription = jsonObject.getString("MAKTX");
String itemDescription = itemSyncRequest.getMAKTX();
//状态
String status = jsonObject.getString("STATUS");
String status = itemSyncRequest.getSTATUS();
String statusBo = HandleEnum.STATUS.getHandle(site, status);
//物料类型(FERT(已完成)/ROH(原始)/HALB(半成品)/KMAT(可配置)/INST(安装)/VERP(包装)/FHMI(生产资源/工具)/CSTM(自定义))
String itemType = jsonObject.getString("ITEM_TYPE");
String itemType = itemSyncRequest.getITEM_TYPE();
//采购类型(M(制造)/P(采购)/B(制造/采购))
String procurementType = jsonObject.getString("PROCUREMENT_TYPE");
String procurementType = itemSyncRequest.getPROCUREMENT_TYPE();
if (!"M".equals(procurementType) && !"P".equals(procurementType) && !"B".equals(procurementType)) {
throw BusinessException.build("参数【PROCUREMENT_TYPE】支持的值为【M、P、B】");
}
//批次大小
String lotSize = jsonObject.getString("LOT_SIZE");
String lotSize = itemSyncRequest.getLOT_SIZE();
lotSize = StringUtil.notBlank(lotSize) ? lotSize : "999999";
//装配时要收集的数据
String assyDataType = jsonObject.getString(" ASSY_DATA_TYPE");
String assyDataType = itemSyncRequest.getASSY_DATA_TYPE();
//库存接收数据类型
String invAssyDataType = jsonObject.getString("INV_ASSY_DATA_TYPE");
String invAssyDataType = itemSyncRequest.getINV_ASSY_DATA_TYPE();
//计量单位
String unitOfMeasure = jsonObject.getString("UNIT_OF_MEASURE");
String unitOfMeasure = itemSyncRequest.getUNIT_OF_MEASURE();
//物料标准API
ItemConfigurationServiceInterface itemServiceInterFace = MEServices.create("com.sap.me.productdefinition", "ItemConfigurationService", site);
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
//物料是否存在
String itemBo = HandleEnum.ITEM.getHandle(site, item, revision);
Item itemModel = itemService.getById(itemBo);
@ -154,6 +151,222 @@ public class InterfaceServiceImpl implements InterfaceService {
//更新物料
itemServiceInterFace.updateItem(updateItem);
}
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
List<CustomFields> customFieldsList = new ArrayList<>();
CustomFields customFields = null;
//辅料类型：ACCESSORY_TYPE
String ingredType = itemSyncRequest.getINGRED_TYPE();
if (StringUtil.notBlank(ingredType)) {
customFields = new CustomFields();
customFields.setHandle(itemBo);
customFields.setAttribute(CustomFieldConstant.ITEM_ACCESSORY_TYPE);
customFields.setValue(ingredType);
customFieldsList.add(customFields);
}
//重量
String weight = itemSyncRequest.getWEIGHT();
if (StringUtil.notBlank(ingredType)) {
customFields = new CustomFields();
customFields.setHandle(itemBo);
customFields.setAttribute(CustomFieldConstant.ITEM_WEIGHT);
customFields.setValue(weight);
customFieldsList.add(customFields);
}
//规格
String spec = itemSyncRequest.getMAT_SPEC();
if (StringUtil.notBlank(ingredType)) {
customFields = new CustomFields();
customFields.setHandle(itemBo);
customFields.setAttribute(CustomFieldConstant.ITEM_MAT_SPEC);
customFields.setValue(spec);
customFieldsList.add(customFields);
}
//型号
String model = itemSyncRequest.getMODEL();
if (StringUtil.notBlank(ingredType)) {
customFields = new CustomFields();
customFields.setHandle(itemBo);
customFields.setAttribute(CustomFieldConstant.ITEM_MODEL);
customFields.setValue(model);
customFieldsList.add(customFields);
}
//材质
String texture = itemSyncRequest.getTEXTURE();
if (StringUtil.notBlank(ingredType)) {
customFields = new CustomFields();
customFields.setHandle(itemBo);
customFields.setAttribute(CustomFieldConstant.ITEM_TEXTURE);
customFields.setValue(texture);
customFieldsList.add(customFields);
}
//图号
String drawing = itemSyncRequest.getDRAWING();
if (StringUtil.notBlank(ingredType)) {
customFields = new CustomFields();
customFields.setHandle(itemBo);
customFields.setAttribute(CustomFieldConstant.ITEM_DRAWING);
customFields.setValue(drawing);
customFieldsList.add(customFields);
}
//图号版本
String drawingRevision = itemSyncRequest.getDRAWING_REVISION();
if (StringUtil.notBlank(ingredType)) {
customFields = new CustomFields();
customFields.setHandle(itemBo);
customFields.setAttribute(CustomFieldConstant.ITEM_DRAWING_REVISION);
customFields.setValue(drawingRevision);
customFieldsList.add(customFields);
}
//自定义数据保存
if (customFieldsList != null && customFieldsList.size() > 0) {
customFieldsService.saveOrUpdateCustomFields(customFieldsList);
}
}
@Override
public void disRouterSync(String site, DisRouterSyncRequest disRouterSyncRequest) throws Exception {
//获取工艺路线标准服务
RouterConfigurationServiceInterface routerConfigurationService = MEServices.create("com.sap.me.productdefinition", "RouterConfigurationService", site);
//工单编号作为工艺路线编号
String router = disRouterSyncRequest.getROUTER();
if (StringUtil.isBlank(router)) {
throw BusinessException.build("工艺路线编号不能为空");
}
//工艺路线步骤是否有值
List<DisRouterStepDto> routerStepDtoList = disRouterSyncRequest.getOPERATION_LIST();
if (routerStepDtoList == null || routerStepDtoList.size() <= 0) {
throw BusinessException.build("工艺路线步骤不能为空");
}
//工艺路线BO
Float revision = new Float(1.0);
String routerType = RouterType.SHOPORDER_SPECIFIC.value();
String routerBo = HandleEnum.ROUTER.getHandle(site, router, routerType, revision.toString());
//查询工艺路线是否存在, 不存在版本默认为1.0，存在最大版本+1最为当前版本
Router routerModel = routerService.getMaxRevisionRouter(site, router);
if (routerModel != null) {
Float currentRevision = new Float(routerModel.getRevision());
revision = currentRevision + 1;
routerBo = HandleEnum.ROUTER.getHandle(site, router, routerType, revision.toString());
}
//工艺路线参数组装
RouterConfiguration routerConfiguration = new RouterConfiguration();
routerConfiguration.setRef(routerBo);
routerConfiguration.setRouter(router);
routerConfiguration.setDescription(router);
routerConfiguration.setRevision(revision.toString());
routerConfiguration.setRouterType(com.sap.me.common.RouterType.SHOPORDER_SPECIFIC);
routerConfiguration.setCurrentRevision(true);
routerConfiguration.setStatus(RouterStatus.Releasable);
//入口步骤
String entryRouterStep = null;
//工艺路线步骤集合
List<RouterStep> routerStepList = new ArrayList<>();
//自定义字段集合
List<CustomFields> customFieldsList = new ArrayList<>();
//工艺路线步骤
for (int i = 0; i < routerStepDtoList.size(); i++) {
DisRouterStepDto routerStepDto = routerStepDtoList.get(i);
String stepId = "90" + routerStepDto.getSTEP_ID();
if (StringUtil.isBlank(entryRouterStep)) {
entryRouterStep = stepId;
}
//上一步骤添加当前步骤为下一步骤
if (i > 0) {
RouterNextStep routerNextStep = new RouterNextStep();
routerNextStep.setNextStepId(stepId);
routerStepList.get(i-1).getRouterNextStepList().add(routerNextStep);
}
String resource = routerStepDto.getRESRCE();
String operation = routerStepDto.getOPERATION();
String _revision = routerStepDto.getREVISION();
_revision = StringUtil.notBlank(_revision) ? _revision : "1.0";
String description = routerStepDto.getOPERATION_DESCRIPTION();
//工序创建
Operation operationModel = this.createResourceOfOperation(site, resource, operation, description, _revision);
String operationBo = operationModel.getHandle();
//工艺路线步骤
RouterStep routerStep = new RouterStep();
routerStep.setSequence(new BigDecimal(i+1));
routerStep.setStepId(stepId);
routerStep.setDescription(operation);
routerStep.setRework(true);
routerStep.setQueueDecisionType(QueueDecisionType.COMPLETING_OPERATOR);
//工艺路线步骤工序 RouterComponentContext
RouterComponentContext routerComponentContext = new RouterComponentContext();
RouterOperation routerOperation = new RouterOperation();
//工艺路线步骤工序默认当前版本
routerOperation.setOperationRef(operationBo);
routerOperation.setStepType(RouterStepType.NORMAL);
routerComponentContext.setRouterOperation(routerOperation);
routerStep.setRouterComponentContext(routerComponentContext);
//步骤入仓
routerStepList.add(routerStep);
//自定义字段
String routerOperationBO = HandleEnum.ROUTER_OPERATION.getHandle(routerBo, stepId);
CustomFields customFields = new CustomFields();
customFields.setHandle(routerOperationBO);
customFields.setAttribute(CustomFieldConstant.ROUTER_OP_PROD_TIME);
customFields.setValue(routerStepDto.getPROD_TIME());
customFieldsList.add(customFields);
customFields = new CustomFields();
customFields.setHandle(routerOperationBO);
customFields.setAttribute(CustomFieldConstant.ROUTER_OP_OUT_SOURCE);
customFields.setValue(routerStepDto.getOUT_SOURCE());
customFieldsList.add(customFields);
}//end for
//添加返回原始工序步骤
String returnStepId = "9099";
RouterStep routerStep = new RouterStep();
routerStep.setSequence(new BigDecimal(returnStepId));
RouterComponentContext routerComponentContext = new RouterComponentContext();
RouterReturnStep routerReturnStep = new RouterReturnStep();
routerReturnStep.setReturnType(ReturnType.ORIGINAL_OPERATION);
routerReturnStep.setCompleteOriginal(true);
routerComponentContext.setRouterReturnStep(routerReturnStep);
routerStep.setRouterComponentContext(routerComponentContext);
routerStep.setStepId(returnStepId);
routerStepList.add(routerStep);
//完成工序添加到下一步骤
RouterNextStep routerNextStep = new RouterNextStep();
routerNextStep.setNextStepId(returnStepId);
routerStepList.get(routerStepList.size()-2).getRouterNextStepList().add(routerNextStep);
routerConfiguration.setEntryRouterStep(entryRouterStep);
routerConfiguration.setRouterStepList(routerStepList);
//工艺路线创建
routerConfigurationService.createRouter(routerConfiguration);
//自定义数据保存
if (customFieldsList != null && customFieldsList.size() > 0) {
customFieldsService.saveOrUpdateCustomFields(customFieldsList);
}
}
@Override
@ -604,4 +817,57 @@ public class InterfaceServiceImpl implements InterfaceService {
}
}
}
/**
* 资源对应的工序创建
*
*/
Operation createResourceOfOperation(String site, String resource, String operation, String description, String revision) {
String resourceBo = HandleEnum.RESOURCE.getHandle(site, resource);
Resrce resourceModel = resrceService.getById(resourceBo);
if (resourceModel == null) {
throw BusinessException.build("资源【" +resource+ "】不存在！");
}
String operationBo = HandleEnum.OPERATION.getHandle(site, operation, revision);
//查询设备所属类型以及对应工序
List<Map<String, Object>> mapList = resrceService.getResourceOperation(resourceBo);
if (mapList == null || mapList.size() <= 0) {
throw BusinessException.build("资源【" +resource+ "】不存在！");
}
Map<String, Object> map = mapList.get(0);
String _operationBo = (String) map.get("OPERATION_BO");
String resourceType = (String) map.get("RESOURCE_TYPE");
if (StringUtil.isBlank(resourceType)) {
throw BusinessException.build("设备【" +resource+ "】没有维护设备类型！");
}
//查询工序是否存在
Operation queryOperation = operationService.getById(operationBo);
if (queryOperation != null) {
if (operationBo.equals(_operationBo)) {
return queryOperation;
} else {
throw BusinessException.build("工序【" + operation + " 】已经存在！");
}
}
String status201Bo = HandleEnum.STATUS.getHandle(site, "201");
String resourceTypeBo = HandleEnum.RESOURCE_TYPE.getHandle(site, resourceType);
//创建工序
Operation operationModel = new Operation();
operationModel.setHandle(operationBo);
operationModel.setSite(site);
operationModel.setOperation(operation);
operationModel.setRevision(revision);
operationModel.setDescription(description);
operationModel.setCurrentRevision("true");
operationModel.setStatusBo(status201Bo);
operationModel.setType("N");
operationModel.setResourceTypeBo(resourceTypeBo);
operationModel.setCreatedDateTime(LocalDateTime.now());
operationService.save(operationModel);
return operationModel;
}
}

1
meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/ResrceMapper.java
Unescape Escape View File

@ -35,4 +35,5 @@ public interface ResrceMapper extends BaseMapper<Resrce> {
List<Resrce> findResourceListByResourceType(@Param("site")String site,@Param("resourceTypeBo")String resourceTypeBo);
List<Map<String, Object>> selectResourceOperation(@Param("resourceBo") String resourceBo);
}

8
meapi/src/main/java/com/foreverwin/mesnac/meapi/service/ResrceService.java
Unescape Escape View File

@ -61,4 +61,12 @@ public interface ResrceService extends IService<Resrce> {
*/
List<Resrce> findResourceListByResourceType(String site,String resourceTypeBo);
/**
* 查询设备所属资源类型以及对应的工序
*
* @param resourceBo
* @return
*/
List<Map<String, Object>> getResourceOperation(String resourceBo);
}

5
meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/ResrceServiceImpl.java
Unescape Escape View File

@ -84,5 +84,10 @@ public class ResrceServiceImpl extends ServiceImpl<ResrceMapper, Resrce> impleme
return resrceMapper.findResourceListByResourceType(site,resourceTypeBo);
}
@Override
public List<Map<String, Object>> getResourceOperation(String resourceBo) {
return resrceMapper.selectResourceOperation(resourceBo);
}
}

13
meapi/src/main/resources/mapper/OperationMapper.xml
Unescape Escape View File

@ -608,12 +608,13 @@
<select id="getCurrentRevisionRef" resultMap="BaseResultMap">
SELECT
HANDLE,OPERATION,
REVISION
FROM OPERATION
WHERE SITE = #{site}
AND OPERATION = #{operation}
AND CURRENT_REVISION = 'true'
O.HANDLE,O.OPERATION,
O.REVISION,OT.DESCRIPTION
FROM OPERATION O
LEFT JOIN OPERATION_T OT ON O.HANDLE = OT.OPERATION_BO AND OT.LOCALE = 'zh'
WHERE O.SITE = #{site}
AND O.OPERATION = #{operation}
AND O.CURRENT_REVISION = 'true'
</select>
<select id="queryOperationByErpWorkCenter" resultMap="BaseResultMap">

9
meapi/src/main/resources/mapper/ResrceMapper.xml
Unescape Escape View File

@ -578,5 +578,12 @@
</select>
<select id="selectResourceOperation" resultType="java.util.HashMap">
SELECT RS.SITE, RS.RESRCE, OP.HANDLE OPERATION_BO,OP.OPERATION, RT.RESOURCE_TYPE
FROM RESRCE RS
LEFT JOIN RESOURCE_TYPE_RESOURCE RR ON RS.HANDLE = RR.RESOURCE_BO
LEFT JOIN OPERATION OP ON OP.RESOURCE_TYPE_BO = RR.RESOURCE_TYPE_BO
LEFT JOIN RESOURCE_TYPE RT ON RT.HANDLE = RR.RESOURCE_TYPE_BO
WHERE RS.HANDLE = #{resourceBo}
</select>
</mapper>

7
production/src/main/java/com/foreverwin/mesnac/production/service/impl/CutterLogServiceImpl.java
Unescape Escape View File

@ -7,15 +7,17 @@ import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.foreverwin.mesnac.common.constant.Constants;
import com.foreverwin.mesnac.common.enums.HandleEnum;
import com.foreverwin.mesnac.common.model.Tool;
import com.foreverwin.mesnac.common.service.CommonService;
import com.foreverwin.mesnac.common.service.ToolService;
import com.foreverwin.mesnac.common.util.StringUtil;
import com.foreverwin.mesnac.meapi.dto.SfcDto;
import com.foreverwin.mesnac.production.mapper.CutterLogMapper;
import com.foreverwin.mesnac.production.mapper.SfcCrossMapper;
import com.foreverwin.mesnac.production.model.CutterLog;
import com.foreverwin.mesnac.production.model.Tool;
import com.foreverwin.mesnac.common.model.Tool;
import com.foreverwin.mesnac.production.service.CutterLogService;
import com.foreverwin.mesnac.production.service.ToolService;
import com.foreverwin.mesnac.common.service.ToolService;
import com.foreverwin.modular.core.exception.BaseException;
import com.foreverwin.modular.core.util.CommonMethods;
import com.foreverwin.modular.core.util.FrontPage;
@ -50,6 +52,7 @@ public class CutterLogServiceImpl extends ServiceImpl<CutterLogMapper, CutterLog
private CommonService commonService;
@Autowired
private ToolService toolService;
@Override
public IPage<CutterLog> selectPage(FrontPage<CutterLog> frontPage, CutterLog cutterLog) {
QueryWrapper<CutterLog> queryWrapper = new QueryWrapper<>();

94
production/src/main/java/com/foreverwin/mesnac/production/service/impl/ToolServiceImpl.java
Unescape Escape View File

@ -1,94 +0,0 @@
package com.foreverwin.mesnac.production.service.impl;
import com.foreverwin.mesnac.common.enums.HandleEnum;
import com.foreverwin.modular.core.exception.BusinessException;
import com.foreverwin.modular.core.util.CommonMethods;
import com.foreverwin.modular.core.util.FrontPage;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.foreverwin.mesnac.production.model.Tool;
import com.foreverwin.mesnac.production.mapper.ToolMapper;
import com.foreverwin.mesnac.production.service.ToolService;
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.List;
/**
* <p>
* 工具表 服务实现类
* </p>
*
* @author pavel.liu
* @since 2021-07-14
*/
@Service
@Transactional(rollbackFor = Exception.class)
public class ToolServiceImpl extends ServiceImpl<ToolMapper, Tool> implements ToolService {
@Autowired
private ToolMapper toolMapper;
@Override
public IPage<Tool> selectPage(FrontPage<Tool> frontPage, Tool tool) {
QueryWrapper<Tool> queryWrapper = new QueryWrapper<>();
queryWrapper.setEntity(tool);
return super.page(frontPage.getPagePlus(), queryWrapper);
}
@Override
public List<Tool> selectList(Tool tool) {
QueryWrapper<Tool> queryWrapper = new QueryWrapper<>();
queryWrapper.setEntity(tool);
return super.list(queryWrapper);
}
@Override
public void saveOrUpdateOne(Tool tool) {
String site = tool.getSite();
String toolNo = tool.getTool();
String handle = HandleEnum.TOOL.getHandle(site, toolNo);
String user = CommonMethods.getUser();
tool.setHandle(handle);
Tool byId = toolMapper.selectById(handle);
if (byId != null){
tool.setCreateUser(byId.getCreateUser());
tool.setCreatedDateTime(byId.getCreatedDateTime());
tool.setModifyUser(user);
tool.setModifiedDateTime(LocalDateTime.now());
toolMapper.updateById(tool);
}else{
tool.setCreateUser(user);
tool.setCreatedDateTime(LocalDateTime.now());
toolMapper.insert(tool);
}
}
@Override
public Tool getOneToolByToolNo(String tool) {
String site = CommonMethods.getSite();
String handle = HandleEnum.TOOL.getHandle(site, tool);
return toolMapper.selectById(handle);
}
@Override
public void deleteInspectionPlanByHandle(String tool) {
String site = CommonMethods.getSite();
String handle = HandleEnum.TOOL.getHandle(site, tool);
String user = CommonMethods.getUser();
Tool byId = toolMapper.selectById(handle);
if (byId == null){
throw BusinessException.build("刀具编号不存在！");
}
byId.setStatus("N");
byId.setModifyUser(user);
byId.setModifiedDateTime(LocalDateTime.now());
toolMapper.updateById(byId);
}
}
Write Preview
Loading…
Cancel
Save