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

生产派工测试问题处理

Browse Source
master
Leon 4 years ago
parent a0d55d759a
commit 70f1482493
21 changed files with 219 additions and 141 deletions
Show Stats Download Patch File Download Diff File

10
common/src/main/java/com/foreverwin/mesnac/common/constant/Constants.java
Unescape Escape View File

@ -8,7 +8,7 @@ package com.foreverwin.mesnac.common.constant;
*/
public interface Constants {
String OP_6106GX = "6106GX";
String OP_WX_6106GX = "WX_6106GX";
String STATUS_NEW = "NEW";
String STATE_CONFIRM ="CONF";
@ -177,4 +177,12 @@ public interface Constants {
*/
String UNTREATED = "UN"; //未处理
String PROCESSED = "PR"; //已处理
//用户组
String USER_GROUP_ADMINISTRATOR = "ADMINISTRATOR";
//车间调度
String USER_GROUP_CJDD = "CJDD";
//总计划
String USER_GROUP_ZJH = "ZJH";
}

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

@ -85,11 +85,13 @@ public class SfcDispatchDto implements Serializable{
*/
@ExcelColumn("资源编号")
private String resrce;
private String resourceDescription;
/**
* 人员编号
*/
@ExcelColumn("操作者")
private String employee;
private String employeeDescription;
/**
* 是否转序
*/
@ -103,23 +105,25 @@ public class SfcDispatchDto implements Serializable{
*/
private Double prodHours;
/**
* 计划开始时间
* 总计划开始时间
*/
@ExcelColumn("计划开始时间")
@ExcelColumn("总计划开始时间")
private LocalDateTime plannedStartDate;
/**
* 计划完成时间
* 总计划完成时间
*/
@ExcelColumn("计划完成时间")
@ExcelColumn("总计划完成时间")
private LocalDateTime plannedCompDate;
/**
* 实际开始时间
* 车间最早开始时间
*/
private LocalDateTime actualStartDate;
@ExcelColumn("车间最早开始时间")
private LocalDateTime earliestStartDate;
/**
* 实际完成时间
* 车间最晚结束时间
*/
private LocalDateTime actualCompleteDate;
@ExcelColumn("车间最晚结束时间")
private LocalDateTime latestEndDate;
/**
* 是否已经派工
*/
@ -176,14 +180,14 @@ public class SfcDispatchDto implements Serializable{
private BigDecimal completedQty;
private String resourceWorkCenter;
private String user;
private String role;
private String status;
private String locale;
private String routerBo;
private String statusName;
private LocalDateTime soReleasedDate;
private LocalDateTime sfcReleasedDate;
private LocalDateTime latestEndDate;
private LocalDateTime earliestStartDate;
private LocalDateTime releasedCompleteDate;
private LocalDateTime dispatchCompleteDate;
@ -353,6 +357,14 @@ public class SfcDispatchDto implements Serializable{
this.resrce = resrce;
}
public String getResourceDescription() {
return resourceDescription;
}
public void setResourceDescription(String resourceDescription) {
this.resourceDescription = resourceDescription;
}
public String getEmployee() {
return employee;
}
@ -361,6 +373,14 @@ public class SfcDispatchDto implements Serializable{
this.employee = employee;
}
public String getEmployeeDescription() {
return employeeDescription;
}
public void setEmployeeDescription(String employeeDescription) {
this.employeeDescription = employeeDescription;
}
public String getTurnOperation() {
return turnOperation;
}
@ -401,28 +421,29 @@ public class SfcDispatchDto implements Serializable{
this.plannedCompDate = plannedCompDate;
}
public LocalDateTime getActualStartDate() {
return actualStartDate;
public String getIsDispatch() {
return isDispatch;
}
public void setActualStartDate(LocalDateTime actualStartDate) {
this.actualStartDate = actualStartDate;
public void setIsDispatch(String isDispatch) {
this.isDispatch = isDispatch;
}
public LocalDateTime getActualCompleteDate() {
return actualCompleteDate;
public String getUser() {
return user;
}
public void setActualCompleteDate(LocalDateTime actualCompleteDate) {
this.actualCompleteDate = actualCompleteDate;
public void setUser(String user) {
this.user = user;
}
public String getIsDispatch() {
return isDispatch;
public String getRole() {
return role;
}
public void setIsDispatch(String isDispatch) {
this.isDispatch = isDispatch;
public void setRole(String role) {
this.role = role;
}
public String getStatus() {

42
console/src/main/resources/application-prd.yml
Unescape Escape View File

@ -0,0 +1,42 @@
#Spring
spring:
datasource:
dynamic:
primary: wip
datasource:
wip:
driver-class-name: com.sap.db.jdbc.Driver
jndi-name: jdbc/jts/wipPool
activemq:
enabled: false
brokerUrl: tcp://121.36.58.109:61616?wireFormat.maxInactivityDuration=0
password: admin
user: admin
pool:
enabled: true
max-connections: 10
#WebService
ws:
erp:
server: 172.16.251.223
port: 8000
user: mesd001
pwd: a123456
valid: N
ftp:
host:
port: 21
username:
password:
#打印服务器配置
print:
server: http://172.16.251.188:8022/print/mesnacprint
exportDocument:
filePath: /usr/word/
outputPath: /usr/word/outputWord/
template: SFC_SCRAP_TEMPLATE.ftl

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

@ -70,12 +70,13 @@ public class SfcDispatchController {
@ResponseBody
@GetMapping("getSfcDispatch")
public R getSfcDispatch(String workCenter, String dispatchStatus, String item, String itemNumber, String workOrder, String shopOrder,
String resrce, String resourceType, String operation, String sfc, String component, String componentDescription, String turnOperation,
String resrce, String resourceType, String operation, String operationDescription, String sfc, String component, String componentDescription, String turnOperation,
String isDispatch, String startFromDate_S, String startToDate_S, String completeFromDate_S, String completeToDate_S) {
List<SfcDispatchDto> list;
try {
SfcDispatchDto sfcDispatchDto = new SfcDispatchDto();
sfcDispatchDto.setSite(CommonMethods.getSite());
sfcDispatchDto.setUser(CommonMethods.getUser());
sfcDispatchDto.setWorkCenter(workCenter);
sfcDispatchDto.setDispatchStatus(dispatchStatus);
sfcDispatchDto.setItem(item);
@ -85,6 +86,7 @@ public class SfcDispatchController {
sfcDispatchDto.setResrce(resrce);
sfcDispatchDto.setResourceType(resourceType);
sfcDispatchDto.setOperation(operation);
sfcDispatchDto.setOperationDescription(operationDescription);
sfcDispatchDto.setSfc(sfc);
sfcDispatchDto.setComponent(component);
sfcDispatchDto.setComponentDescription(componentDescription);
@ -123,6 +125,7 @@ public class SfcDispatchController {
List<SfcDispatchDto> list;
try {
sfcDispatchDto.setSite(CommonMethods.getSite());
sfcDispatchDto.setUser(CommonMethods.getUser());
if (sfcDispatchDto.getStartFromDate_S() != null) {
sfcDispatchDto.setStartFromDate(DateUtil.parse(sfcDispatchDto.getStartFromDate_S()));
}
@ -145,58 +148,6 @@ public class SfcDispatchController {
}
/**
* 分页查询数据
*
* @param frontPage 分页信息
* @return
*/
@ResponseBody
@GetMapping("/page")
public R page(FrontPage<SfcDispatch> frontPage, SfcDispatch sfcDispatch){
IPage result;
QueryWrapper<SfcDispatch> queryWrapper = new QueryWrapper<>();
queryWrapper.setEntity(sfcDispatch);
sfcDispatch.setSite(CommonMethods.getSite());
if (frontPage.getGlobalQuery() != null && !"".equals(frontPage.getGlobalQuery().trim())) {
//TODO modify global query
queryWrapper.lambda().and(wrapper -> wrapper
.like(SfcDispatch::getHandle, frontPage.getGlobalQuery())
.or().like(SfcDispatch::getSite, frontPage.getGlobalQuery())
.or().like(SfcDispatch::getShopOrder, frontPage.getGlobalQuery())
.or().like(SfcDispatch::getSfc, frontPage.getGlobalQuery())
.or().like(SfcDispatch::getBlankingSize, frontPage.getGlobalQuery())
.or().like(SfcDispatch::getDispatchSeq, frontPage.getGlobalQuery())
.or().like(SfcDispatch::getDispatchNo, frontPage.getGlobalQuery())
.or().like(SfcDispatch::getDispatchStatus, frontPage.getGlobalQuery())
.or().like(SfcDispatch::getDrawingsNo, frontPage.getGlobalQuery())
.or().like(SfcDispatch::getDrawingsRevision, frontPage.getGlobalQuery())
.or().like(SfcDispatch::getIsLock, frontPage.getGlobalQuery())
.or().like(SfcDispatch::getRouterBo, frontPage.getGlobalQuery())
.or().like(SfcDispatch::getStepId, frontPage.getGlobalQuery())
.or().like(SfcDispatch::getOperation, frontPage.getGlobalQuery())
.or().like(SfcDispatch::getResourceType, frontPage.getGlobalQuery())
.or().like(SfcDispatch::getWorkCenter, frontPage.getGlobalQuery())
.or().like(SfcDispatch::getResrce, frontPage.getGlobalQuery())
.or().like(SfcDispatch::getEmployee, frontPage.getGlobalQuery())
.or().like(SfcDispatch::getTurnOperation, frontPage.getGlobalQuery())
.or().like(SfcDispatch::getIsDispatch, frontPage.getGlobalQuery())
.or().like(SfcDispatch::getIsImport, frontPage.getGlobalQuery())
.or().like(SfcDispatch::getRemark, frontPage.getGlobalQuery())
.or().like(SfcDispatch::getCreateUser, frontPage.getGlobalQuery())
.or().like(SfcDispatch::getModifyUser, frontPage.getGlobalQuery())
.or().like(SfcDispatch::getOther1, frontPage.getGlobalQuery())
.or().like(SfcDispatch::getOther2, frontPage.getGlobalQuery())
.or().like(SfcDispatch::getOther3, frontPage.getGlobalQuery())
.or().like(SfcDispatch::getOther4, frontPage.getGlobalQuery())
.or().like(SfcDispatch::getOther5, frontPage.getGlobalQuery())
);
}
result = sfcDispatchService.page(frontPage.getPagePlus(), queryWrapper);
return R.ok(result);
}
@ResponseBody
@PostMapping("/saveDispatch")
public R saveDispatch(@RequestBody List<SfcDispatchDto> sfcDispatchList) {

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

@ -158,10 +158,10 @@ public class UserResourceController {
@ResponseBody
@GetMapping("/findEmployeeList")
public R findEmployeeList() {
public R findEmployeeList(String resourceType) {
try {
String site = CommonMethods.getSite();
return R.ok(userResourceService.findEmployeeList(site));
return R.ok(userResourceService.findEmployeeList(site, resourceType));
} catch (Exception e) {
return R.failed(e.getMessage());
}

2
dispatch/src/main/java/com/foreverwin/mesnac/dispatch/mapper/SfcDispatchMapper.java
Unescape Escape View File

@ -1,10 +1,8 @@
package com.foreverwin.mesnac.dispatch.mapper;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.foreverwin.mesnac.common.dto.SfcDispatchDto;
import com.foreverwin.mesnac.dispatch.model.SfcDispatch;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.foreverwin.mesnac.dispatch.model.ShopOrderRelease;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;

2
dispatch/src/main/java/com/foreverwin/mesnac/dispatch/mapper/UserResourceMapper.java
Unescape Escape View File

@ -20,7 +20,7 @@ import java.util.List;
@Repository
public interface UserResourceMapper extends BaseMapper<UserResource> {
List<NwaUser> findEmployeeList(@Param("site") String site);
List<NwaUser> findEmployeeList(@Param("site") String site, @Param("resourceType") String resourceType);
List<UserResource> findEnableList(@Param("site") String site, @Param("resource") String resource, @Param("user") String user);

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

@ -70,10 +70,9 @@ public interface ShopOrderReleaseService {
*
* @param site
* @param user
* @param workCenter
* @param shopOrderModel
* @param sfcModel
* @param routerList
*/
void sfcDispatch(String site, String user, String workCenter, ShopOrder shopOrderModel, Sfc sfcModel, List<RouterDTO> routerList);
void sfcDispatch(String site, String user, ShopOrder shopOrderModel, Sfc sfcModel, List<RouterDTO> routerList);
}

2
dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/UserResourceService.java
Unescape Escape View File

@ -20,7 +20,7 @@ import java.util.List;
*/
public interface UserResourceService extends IService<UserResource> {
List<NwaUser> findEmployeeList(String site);
List<NwaUser> findEmployeeList(String site, String resourceType);
List<UserResource> findEnableList(String site, String resource, String user);

15
dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/CallItemServiceImpl.java
Unescape Escape View File

@ -59,7 +59,8 @@ public class CallItemServiceImpl extends ServiceImpl<CallItemMapper, CallItem> i
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
//工序叫料数据
for (SfcDispatchDto sfcDispatchDto : sfcDispatchList) {
//Leon.L 2021/8/16 业务取消工序叫料
/**for (SfcDispatchDto sfcDispatchDto : sfcDispatchList) {
String prepositionStepId = sfcDispatchDto.getPrepositionStepId();
if (StringUtil.isBlank(prepositionStepId)) {
continue;
@ -86,7 +87,7 @@ public class CallItemServiceImpl extends ServiceImpl<CallItemMapper, CallItem> i
callItem.setModifyUser(user);
callItem.setModifiedDateTime(nowDate);
list.add(callItem);
}
}**/
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@ -323,11 +324,11 @@ public class CallItemServiceImpl extends ServiceImpl<CallItemMapper, CallItem> i
String blankingSize = callItem.getBlankingSize();
//工序叫料不需要计算数量
if (Constants.CALL_TYPE_OPERATION.equals(callItem.getCallType())) {
/**if (Constants.CALL_TYPE_OPERATION.equals(callItem.getCallType())) {
callItem.setSizeReqQty(BigDecimal.ONE);
compQtyMap.put(component, BigDecimal.ONE);
continue;
}
}**/
if (StringUtil.isBlank(blankingSize)) {
callItem.setSizeReqQty(callItem.getRequiredQty());
@ -335,8 +336,10 @@ public class CallItemServiceImpl extends ServiceImpl<CallItemMapper, CallItem> i
continue;
}
if ("GB".equals(itemGroup)) {
if (!blankingSize.contains("*")) {
if (StringUtil.notBlank(itemGroup) && "GB".equals(itemGroup)) {
if (!blankingSize.contains("*") || blankingSize.split("\\*").length < 2) {
callItem.setSizeReqQty(callItem.getRequiredQty());
compQtyMap.put(component, callItem.getRequiredQty());
continue;
}

64
dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SfcDispatchServiceImpl.java
Unescape Escape View File

@ -25,6 +25,7 @@ import com.foreverwin.mesnac.meapi.dto.WorkCenterLinkDTO;
import com.foreverwin.mesnac.meapi.model.Router;
import com.foreverwin.mesnac.meapi.model.Sfc;
import com.foreverwin.mesnac.meapi.model.ShopOrder;
import com.foreverwin.mesnac.meapi.model.UserGroup;
import com.foreverwin.mesnac.meapi.service.*;
import com.foreverwin.mesnac.meapi.util.StringUtils;
import com.foreverwin.modular.core.exception.BaseException;
@ -36,6 +37,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
import sun.awt.geom.AreaOp;
import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
@ -67,6 +69,8 @@ public class SfcDispatchServiceImpl extends ServiceImpl<SfcDispatchMapper, SfcDi
@Autowired
private ShopOrderService shopOrderService;
@Autowired
private UserGroupService userGroupService;
@Autowired
private SfcDispatchMapper sfcDispatchMapper;
@Autowired
private UserResourceService userResourceService;
@ -86,7 +90,38 @@ public class SfcDispatchServiceImpl extends ServiceImpl<SfcDispatchMapper, SfcDi
@Override
public List<SfcDispatchDto> findSfcDispatchList(SfcDispatchDto sfcDispatchDto) {
return sfcDispatchMapper.findSfcDispatchList(sfcDispatchDto);
List<SfcDispatchDto> list = sfcDispatchMapper.findSfcDispatchList(sfcDispatchDto);
if (list == null || list.size() <= 0) {
return list;
}
//查询用户对应用户组
String site = CommonMethods.getSite();
String user = CommonMethods.getUser();
String userBo = HandleEnum.USER.getHandle(site, user);
List<UserGroup> userGroupList = userGroupService.getUserGroupListByUserBo(userBo);
String role = "ADMINISTRATOR";
if (userGroupList != null && userGroupList.size() > 0) {
for (UserGroup userGroupModel: userGroupList) {
String userGroup = userGroupModel.getUserGroup();
if (Constants.USER_GROUP_ADMINISTRATOR.equals(userGroup)) {
role = Constants.USER_GROUP_ADMINISTRATOR;
break;
} else if (Constants.USER_GROUP_CJDD.equals(userGroup)) {
role = Constants.USER_GROUP_CJDD;
break;
} else if (Constants.USER_GROUP_ZJH.equals(userGroup)) {
role = Constants.USER_GROUP_ZJH;
break;
}
}
}
//赋值用户组
for (SfcDispatchDto sfcDispatch: list) {
sfcDispatch.setRole(role);
}
return list;
}
@Override
@ -360,6 +395,10 @@ public class SfcDispatchServiceImpl extends ServiceImpl<SfcDispatchMapper, SfcDi
message.append("派工单[" + dispatchNo + "]的派工状态不是新建，不允许保存");
continue;
}
//时间
sfcDispatchDto.setEarliestStartDate(sfcDispatchDto.getPlannedStartDate());
sfcDispatchDto.setLatestEndDate(sfcDispatchDto.getPlannedCompDate());
}
//派工导入
@ -444,7 +483,7 @@ public class SfcDispatchServiceImpl extends ServiceImpl<SfcDispatchMapper, SfcDi
continue;
}
//派工人员为多个
//派工人员为多个(只要一个匹配)
String [] employeeArray = new String[1];
if (!employees.contains(",")) {
employeeArray[0] = employees;
@ -452,7 +491,7 @@ public class SfcDispatchServiceImpl extends ServiceImpl<SfcDispatchMapper, SfcDi
employeeArray = employees.split(",");
}
Boolean isMatch = false;
for (int m = 0; m < employeeArray.length; m++) {
String employee = employeeArray[m];
List<UserResource> singleUserResourceList = usMap.get(employee);
@ -464,7 +503,6 @@ public class SfcDispatchServiceImpl extends ServiceImpl<SfcDispatchMapper, SfcDi
}
Boolean isMatch = false;
for (int i = 0; i < singleUserResourceList.size(); i++) {
UserResource userResource = singleUserResourceList.get(i);
if (resource.equals(userResource.getResrce())) {
@ -472,12 +510,16 @@ public class SfcDispatchServiceImpl extends ServiceImpl<SfcDispatchMapper, SfcDi
break;
}
}
if (!isMatch) {
flag = false;
message.append(seq++ % 3 == 0 ? "\n" : "| |");
message.append("派工单[" + dispatchNo + "]分配的操作员[" + employee + "]与资源[" + resource + "]不匹配");
continue;
}
if (isMatch) {break;}
}
if (!isMatch) {
flag = false;
message.append(seq++ % 3 == 0 ? "\n" : "| |");
message.append("派工单[" + dispatchNo + "]分配的操作员与资源[" + resource + "]都不匹配");
continue;
}
}
@ -532,7 +574,7 @@ public class SfcDispatchServiceImpl extends ServiceImpl<SfcDispatchMapper, SfcDi
}
shopOrderReleaseService.sfcDispatch(site, user, workCenter, shopOrderModel, sfcModel, routerList);
shopOrderReleaseService.sfcDispatch(site, user, shopOrderModel, sfcModel, routerList);
}
@Override

39
dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/ShopOrderReleaseServiceImpl.java
Unescape Escape View File

@ -126,23 +126,6 @@ public class ShopOrderReleaseServiceImpl implements ShopOrderReleaseService {
throw new BaseException("工艺路线[" +StringUtils.trimHandle(routerBo)+ "]主数据不完整，请确认");
}
//获取车间
String workCenter = null;
String workCenterBo = null;
for (RouterDTO routerDTO: routerList) {
String operation = routerDTO.getOperation();
if (!Constants.OP_6106GX.equals(operation) && operation.contains("_")) {
workCenter = operation.split("_")[0];
workCenterBo = HandleEnum.WORK_CENTER.getHandle(site, workCenter);
WorkCenter workCenterModel = workCenterService.getById(workCenterBo);
if (workCenterModel == null) {
throw BusinessException.build("生产车间【" +workCenter+ "】不存在");
}
break;
}
}
//工单下达
ReleaseShopOrderResponse response = null;
try {
@ -169,16 +152,17 @@ public class ShopOrderReleaseServiceImpl implements ShopOrderReleaseService {
Sfc sfcModel = new Sfc();
sfcModel.setSfc(releasedSfc.getSfc());
sfcModel.setQty(releasedSfc.getQuantity().doubleValue());
sfcDispatch(site, user, workCenter, shopOrderModel, sfcModel, routerList);
sfcDispatch(site, user, shopOrderModel, sfcModel, routerList);
}//end for sfcList
//修改工单的计划工作中心
if (StringUtils.notBlank(workCenter)) {
//工单对应多个车间，所以工单不写计划工作中心
/**if (StringUtils.notBlank(workCenter)) {
ShopOrder updateShopOrder = new ShopOrder();
updateShopOrder.setHandle(shopOrderBo);
updateShopOrder.setPlannedWorkCenterBo(workCenterBo);
shopOrderService.updateById(updateShopOrder);
}
}*/
} //end for shopOrderList
}
@ -186,7 +170,7 @@ public class ShopOrderReleaseServiceImpl implements ShopOrderReleaseService {
//------------------------------------------------------------------------------------------------------------------
/**派工--按工序**/
@Override
public void sfcDispatch(String site, String user, String workCenter, ShopOrder shopOrderModel, Sfc sfcModel, List<RouterDTO> routerList) {
public void sfcDispatch(String site, String user, ShopOrder shopOrderModel, Sfc sfcModel, List<RouterDTO> routerList) {
LocalDateTime nowDate = LocalDateTime.now();
String router = routerList.get(0).getRouter();
@ -244,6 +228,19 @@ public class ShopOrderReleaseServiceImpl implements ShopOrderReleaseService {
//计算完成时间
//plannedCompleteDate = plannedStartDate.plusMinutes(prodHours.longValue());
//查询工序所属车间
String workCenter = null;
if (operation.contains("_")) {
workCenter = operation.split("_")[0];
} else {
workCenter = operation;
}
String workCenterBo = HandleEnum.WORK_CENTER.getHandle(site, workCenter);
WorkCenter workCenterModel = workCenterService.getById(workCenterBo);
if (workCenterModel == null) {
throw BusinessException.build("生产车间【" +workCenter+ "】不存在");
}
//派工数据
String dispatchNo = sfc + "-" + stepId;
SfcDispatch sfcDispatchModel = new SfcDispatch();

7
dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/UserResourceServiceImpl.java
Unescape Escape View File

@ -41,16 +41,13 @@ public class UserResourceServiceImpl extends ServiceImpl<UserResourceMapper, Use
@Autowired
private ResrceService resrceService;
@Autowired
private NwaUserService nwaUserService;
@Autowired
private UserService userService;
@Override
public List<NwaUser> findEmployeeList(String site) {
return userResourceMapper.findEmployeeList(site);
public List<NwaUser> findEmployeeList(String site, String resourceType) {
return userResourceMapper.findEmployeeList(site, resourceType);
}
@Override

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

@ -894,7 +894,7 @@
LEFT JOIN ITEM_GROUP IG ON IG.HANDLE = IGM.ITEM_GROUP_BO
INNER JOIN SHOP_ORDER SO ON SO.SITE = L.SITE AND SO.SHOP_ORDER = L.SHOP_ORDER
LEFT JOIN CUSTOM_FIELDS CF ON CF.HANDLE = SO.HANDLE AND CF."ATTRIBUTE" = 'WORK_ORDER'
WHERE L.SITE = #{site} AND L.STATUS = '802'
WHERE L.SITE = #{site} AND L.STATUS = '802' AND L.CALL_TYPE = 'MATERIAL'
<if test="workCenter != null and workCenter != ''">
AND W.WORK_CENTER = #{workCenter}
</if>
@ -925,8 +925,8 @@
) ZS ON ZS.SITE = L.SITE AND ZS.SFC = L.SFC
INNER JOIN Z_SFC_DISPATCH ZD ON ZD.SITE = ZS.SITE AND ZD.SFC = ZS.SFC AND ZD.DISPATCH_SEQ = ZS.DISPATCH_SEQ
WHERE W.QTY_ON_HAND > 0
) SIP
ON VIP.SITE = SIP.SITE AND VIP.ITEM_BO = SIP.ITEM_BO AND VIP.REQUIRED_QTY > 0
) SIP ON VIP.SITE = SIP.SITE AND VIP.ITEM_BO = SIP.ITEM_BO
WHERE VIP.REQUIRED_QTY > 0
ORDER BY VIP.WORK_ORDER, VIP.ITEM
</select>
@ -942,7 +942,7 @@
LEFT JOIN ITEM_GROUP IG ON IG.HANDLE = IGM.ITEM_GROUP_BO
INNER JOIN SHOP_ORDER SO ON SO.SITE = L.SITE AND SO.SHOP_ORDER = L.SHOP_ORDER
LEFT JOIN CUSTOM_FIELDS CF ON CF.HANDLE = SO.HANDLE AND CF."ATTRIBUTE" = 'WORK_ORDER'
WHERE L.SITE = #{site} AND L.STATUS = '802'
WHERE L.SITE = #{site} AND L.STATUS = '802' AND L.CALL_TYPE = 'MATERIAL'
<if test="workCenter != null and workCenter != ''">
AND W.WORK_CENTER = #{workCenter}
</if>
@ -973,8 +973,8 @@
) ZS ON ZS.SITE = L.SITE AND ZS.SFC = L.SFC
INNER JOIN Z_SFC_DISPATCH ZD ON ZD.SITE = ZS.SITE AND ZD.SFC = ZS.SFC AND ZD.DISPATCH_SEQ = ZS.DISPATCH_SEQ
WHERE W.QTY_ON_HAND > 0
) SIP
ON VIP.SITE = SIP.SITE AND VIP.ITEM_BO = SIP.ITEM_BO AND VIP.REQUIRED_QTY > 0
) SIP ON VIP.SITE = SIP.SITE AND VIP.ITEM_BO = SIP.ITEM_BO
WHERE VIP.REQUIRED_QTY > 0
ORDER BY VIP.WORK_ORDER, VIP.ITEM
</select>

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

@ -52,6 +52,8 @@
</resultMap>
<resultMap id="FullResultMap" type="com.foreverwin.mesnac.common.dto.SfcDispatchDto">
<result column="USER" property="user" />
<result column="ROLE" property="role" />
<result column="IS_COMPLETED" property="isCompleted" />
<result column="ITEM_BO" property="itemBo" />
<result column="ITEM" property="item" />
@ -985,17 +987,17 @@
SELECT WIP.*, CASE WHEN WIP.DISPATCH_SEQ = 1 THEN WIP.PLANNED_START_DATE ELSE V1.PLANNED_COMP_DATE END EARLIEST_START_DATE,
CASE WHEN V2.HANDLE IS NOT NULL THEN V2.PLANNED_START_DATE ELSE WIP.PLANNED_COMP_DATE END LATEST_END_DATE,
V1.STEP_ID PREPOSITION_STEP_ID, V1.OPERATION PREPOSITION_OPERATION,
CASE WHEN WIP.DISPATCH_SEQ = 1 OR V1.OTHER_1 = 'true' THEN N'是' ELSE N'否' END IS_COMPLETED,
CASE WHEN WIP.DISPATCH_SEQ = 1 OR V1.DISPATCH_STATUS = 'COMPLETE' THEN N'是' ELSE N'否' END IS_COMPLETED,
CASE WHEN WIP.DISPATCH_STATUS = 'NEW' THEN N'新建' WHEN WIP.DISPATCH_STATUS = 'CANCEL' THEN N'取消'
WHEN WIP.DISPATCH_STATUS = 'PAUSE' THEN N'暂停' WHEN WIP.DISPATCH_STATUS = 'RELEASE' THEN N'发布'
END AS STATUS_NAME
END AS STATUS_NAME, 'ADMINISTRATOR' AS ROLE
FROM (
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,
CASE WHEN SD.DISPATCH_STATUS = 'COMPLETE' 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,
CASE WHEN SD.TURN_OPERATION = 'true' THEN N'是' ELSE N'否' END TURN_OPERATION, SD.BLANKING_SIZE,
CASE WHEN IM.LOT_SIZE = 1 THEN N'是' ELSE N'否' END IS_MAJOR, WR.WORK_CENTER RESOURCE_WORK_CENTER
CASE WHEN IM.LOT_SIZE = 1 THEN N'是' ELSE N'否' END IS_MAJOR, CASE WHEN SD.TURN_OPERATION = 'true' THEN N'是' ELSE N'否' END TURN_OPERATION, SD.BLANKING_SIZE,
WR.WORK_CENTER RESOURCE_WORK_CENTER
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'
@ -1037,6 +1039,9 @@
<if test="operation != null and operation != ''">
AND SD.OPERATION = #{operation}
</if>
<if test="operationDescription != null and operationDescription != ''">
AND OT.DESCRIPTION = #{operationDescription}
</if>
<if test="sfc != null and sfc != ''">
AND SD.SFC = #{sfc}
</if>

4
dispatch/src/main/resources/mapper/UserResourceMapper.xml
Unescape Escape View File

@ -467,8 +467,10 @@
<select id="findEmployeeList" resultType="com.foreverwin.mesnac.meapi.model.NwaUser">
SELECT DISTINCT A.SITE, A.USER_ID USER_NAME, B.FIRST_NAME, B.LAST_NAME, NVL(B.FULL_NAME, A.USER_DESCRIPTION) FULL_NAME
FROM Z_USER_RESOURCE A
INNER JOIN RESOURCE_TYPE_RESOURCE WM ON WM.RESOURCE_BO = A.RESOURCE_BO
INNER JOIN RESOURCE_TYPE RT ON RT.HANDLE = WM.RESOURCE_TYPE_BO
LEFT JOIN Z_NWA_USER B ON A.SITE = B.SITE AND A.USER_ID = B.USER_NAME
WHERE A.SITE = #{site}
WHERE A.SITE = #{site} AND RT.RESOURCE_TYPE = #{resourceType}
</select>
<select id="findAll" resultMap="UserResourceDto">

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

@ -546,7 +546,7 @@ public class InterfaceServiceImpl implements InterfaceService {
String operation = null;
String operationBo = null;
if (StringUtil.isBlank(erpWorkCenter)) {
operation = Constants.OP_6106GX;
operation = Constants.OP_WX_6106GX;
Operation operationModel = operationService.getCurrentRevisionRef(site, operation);
if (operationModel == null) {
throw BusinessException.build("工序编号【" +operation+ "】不存在");

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

@ -26,4 +26,5 @@ public interface UserGroupMapper extends BaseMapper<UserGroup> {
UserGroup getCustomFieldByGroup(@Param("site")String site,
@Param("userGroup")String userGroup);
List<UserGroup> selectUserGroupListByUserBo(@Param("userBo") String userBo);
}

2
meapi/src/main/java/com/foreverwin/mesnac/meapi/service/UserGroupService.java
Unescape Escape View File

@ -25,4 +25,6 @@ public interface UserGroupService extends IService<UserGroup> {
IPage<UserGroup> selectPage(FrontPage<UserGroup> frontPage, UserGroup userGroup);
List<UserGroup> selectList(UserGroup userGroup);
List<UserGroup> getUserGroupListByUserBo(String userBo);
}

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

@ -42,5 +42,8 @@ public class UserGroupServiceImpl extends ServiceImpl<UserGroupMapper, UserGroup
return super.list(queryWrapper);
}
@Override
public List<UserGroup> getUserGroupListByUserBo(String userBo) {
return userGroupMapper.selectUserGroupListByUserBo(userBo);
}
}

7
meapi/src/main/resources/mapper/UserGroupMapper.xml
Unescape Escape View File

@ -358,4 +358,11 @@
LEFT JOIN CUSTOM_FIELDS CF2 ON CF2.HANDLE = UG.HANDLE AND CF2."ATTRIBUTE" = 'MESSAGE_NOTICE_TIME'
WHERE UG.USER_GROUP = #{userGroup} AND UG.SITE = #{site}
</select>
<select id="selectUserGroupListByUserBo" resultMap="BaseResultMap">
SELECT UG.HANDLE, UG.SITE, UG.USER_GROUP, UG.DESCRIPTION, UG.WORKSTATION_BO, UG.CREATED_DATE_TIME, UG.MODIFIED_DATE_TIME
FROM USER_GROUP UG
INNER JOIN USER_GROUP_MEMBER UM ON UM.USER_GROUP_BO = UG.HANDLE
WHERE UM.USER_OR_GROUP_GBO = #{userBo}
</select>
</mapper>

Write Preview
Loading…
Cancel
Save