sfms3.0
/
sfms3.0
3
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master_hella' into master_hella

hella_online_20240911
liuchen864 2 weeks ago
parent
23371a6915 40c9870ff2
commit
0183c831dd
3 changed files with 22 additions and 20 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshJob/RepleinshJobMainServiceImpl.java
  2. 3
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshRecord/RepleinshRecordMainServiceImpl.java
  3. 31
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshRequest/RepleinshRequestMainServiceImpl.java

8
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshJob/RepleinshJobMainServiceImpl.java
View File

@ -214,7 +214,7 @@ public class RepleinshJobMainServiceImpl implements RepleinshJobMainService {
repleinshJobMainDO.setAcceptUserId(String.valueOf(userId));
repleinshJobMainDO.setAcceptUserName(userRespDTO.getNickname());
repleinshJobMainDO.setAcceptTime(LocalDateTime.now());
trendsApi.createTrends(id, "job_repleinsh_main", "承接了补料任务", TrendsTypeEnum.JOB_ACCEPT);
trendsApi.createTrends(id, "job_repleinsh_main", "承接了补料任务", TrendsTypeEnum.JOB_ACCEPT, String.valueOf(getLoginUserId()));
return repleinshJobMainMapper.updateById(repleinshJobMainDO);
}
@ -230,7 +230,7 @@ public class RepleinshJobMainServiceImpl implements RepleinshJobMainService {
repleinshJobMainDO.setAcceptUserId(null);
repleinshJobMainDO.setAcceptUserName(null);
repleinshJobMainDO.setAcceptTime(null);
trendsApi.createTrends(id, "job_repleinsh_main", "取消了补料任务", TrendsTypeEnum.JOB_ABANDON);
trendsApi.createTrends(id, "job_repleinsh_main", "取消了补料任务", TrendsTypeEnum.JOB_ABANDON, String.valueOf(getLoginUserId()));
return repleinshJobMainMapper.updateById(repleinshJobMainDO);
}
@ -243,7 +243,7 @@ public class RepleinshJobMainServiceImpl implements RepleinshJobMainService {
throw exception(REPLEINSH_JOB_MAIN_STATUS_ERROR);
}
repleinshJobMainDO.setStatus(jobStatusState.getState().getCode());
trendsApi.createTrends(id, "job_repleinsh_main", "关闭了补料任务", TrendsTypeEnum.JOB_CLOSE);
trendsApi.createTrends(id, "job_repleinsh_main", "关闭了补料任务", TrendsTypeEnum.JOB_CLOSE, String.valueOf(getLoginUserId()));
// 移除预计入
expectinService.deleteExpectinByJobNumber(repleinshJobMainDO.getNumber());
@ -650,7 +650,7 @@ public class RepleinshJobMainServiceImpl implements RepleinshJobMainService {
repleinshRequestMainMapper.updateById(repleinshRequestMainDO);
// 变更记录
trendsApi.createTrends(repleinshRecordMainDO.getId(), "job_repleinsh_main", "执行了补料任务", TrendsTypeEnum.JOB_EXECUTE);
trendsApi.createTrends(repleinshRecordMainDO.getId(), "job_repleinsh_main", "执行了补料任务", TrendsTypeEnum.JOB_EXECUTE, String.valueOf(getLoginUserId()));
// 创建翻包申请 20240811 cxm 从补料申请创建翻包申请修改到补料任务执行之后创建翻包申请
// 判断 补料 目标库区类型 线边区 不进行翻包
if (!jobUtils.getAreabasicDO(repleinshRequestDetailDOList.get(0).getToLocationCode()).getType().equals("WIP")) {

3
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshRecord/RepleinshRecordMainServiceImpl.java
View File

@ -1,5 +1,6 @@
package com.win.module.wms.service.repleinshRecord;
import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.win.framework.common.exception.ServiceException;
import com.win.framework.common.pojo.CustomConditions;
@ -328,7 +329,7 @@ public class RepleinshRecordMainServiceImpl implements RepleinshRecordMainServic
//增加库存事务
transactionService.createTransaction(transactionCreateReqVOList);
//增加操作记录
trendsApi.createTrends(mainDO.getId(), "record_repleinsh_main", "增加了补料记录", TrendsTypeEnum.CREATE);
trendsApi.createTrends(mainDO.getId(), "record_repleinsh_main", null, "增加了补料记录", JSONUtil.toJsonStr(mainDO), TrendsTypeEnum.CREATE, String.valueOf(getLoginUserId()));
// 创建翻包申请 20240811 cxm 从补料申请创建翻包申请修改到补料任务执行之后创建翻包申请
// 判断 补料 目标库区类型 线边区 不进行翻包
List<RepleinshRecordDetailCreateReqVO> recordDetailListOverPack = new ArrayList<>();

31
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshRequest/RepleinshRequestMainServiceImpl.java
View File

@ -1,6 +1,7 @@
package com.win.module.wms.service.repleinshRequest;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.win.framework.common.exception.ServiceException;
import com.win.framework.common.pojo.CustomConditions;
@ -201,7 +202,7 @@ public class RepleinshRequestMainServiceImpl implements RepleinshRequestMainServ
if (RequestStatusEnum.HANDLING.getCode().equals(mainDO.getStatus())) {
this.splitType(mainDO, subDOList);
}
trendsApi.createTrendsByTask(mainDO.getId(), "request_repleinsh_main", "增加了补料申请", TrendsTypeEnum.CREATE,mainDO.getCreator());
trendsApi.createTrends(mainDO.getId(), "request_repleinsh_main", null, "增加了补料申请", JSONUtil.toJsonStr(mainDO), TrendsTypeEnum.CREATE, String.valueOf(getLoginUserId()));
return mainDO.getId();
}
@ -219,7 +220,7 @@ public class RepleinshRequestMainServiceImpl implements RepleinshRequestMainServ
throw exception(REPLEINSH_REQUEST_STATUS_NOT_NEW);
}
// 增加操作记录
trendsApi.createTrends(updateReqVO.getId(), "request_repleinsh_main", "修改了补料申请", TrendsTypeEnum.UPDATE);
trendsApi.createTrends(updateReqVO.getId(), "request_repleinsh_main", JSONUtil.toJsonStr(repleinshRequestMainDO),"修改了补料申请", JSONUtil.toJsonStr(updateReqVO),TrendsTypeEnum.UPDATE, String.valueOf(getLoginUserId()));
// 更新
if(updateReqVO.getDueTime()!=null){
repleinshRequestMainDO.setDueTime(updateReqVO.getDueTime());
@ -335,7 +336,7 @@ public class RepleinshRequestMainServiceImpl implements RepleinshRequestMainServ
mainDO.setRequestTime(LocalDateTime.now());
repleinshRequestMainMapper.insert(mainDO);
// 增加操作记录
trendsApi.createTrends(mainDO.getId(), "request_repleinsh_main", "导入了补料申请", TrendsTypeEnum.CREATE);
trendsApi.createTrends(mainDO.getId(), "request_repleinsh_main", null, "导入了补料申请", JSONUtil.toJsonStr(mainDO),TrendsTypeEnum.CREATE, String.valueOf(getLoginUserId()));
for (RepleinshRequestDetailDO detailDO : subDOList) {
detailDO.setMasterId(mainDO.getId());
detailDO.setNumber(number);
@ -394,7 +395,7 @@ public class RepleinshRequestMainServiceImpl implements RepleinshRequestMainServ
}
});
// 增加操作记录
trendsApi.createTrends(id, "request_repleinsh_main", "关闭了补料申请", TrendsTypeEnum.REQUEST_CLOSE);
trendsApi.createTrends(id, "request_repleinsh_main", "关闭了补料申请", TrendsTypeEnum.REQUEST_CLOSE, String.valueOf(getLoginUserId()));
return repleinshRequestMainMapper.updateById(mainDO);
}
@ -415,7 +416,7 @@ public class RepleinshRequestMainServiceImpl implements RepleinshRequestMainServ
throw new ServiceException(REPLEINSH_REQUEST_STATUS_ERROR);
}
mainDO.setStatus(requestStatusState.getState().getCode());// 增加操作记录
trendsApi.createTrends(id, "request_repleinsh_main", "打开了补料申请", TrendsTypeEnum.REQUEST_RE_ADD);
trendsApi.createTrends(id, "request_repleinsh_main", "打开了补料申请", TrendsTypeEnum.REQUEST_RE_ADD, String.valueOf(getLoginUserId()));
return repleinshRequestMainMapper.updateById(mainDO);
}
@ -438,7 +439,7 @@ public class RepleinshRequestMainServiceImpl implements RepleinshRequestMainServ
if (RequestStatusEnum.HANDLING.getCode().equals(mainDO.getStatus())) {
this.splitType(mainDO, repleinshRequestDetailMapper.selectList(mainDO.getId()));
}
trendsApi.createTrends(id, "request_repleinsh_main", "提交了补料申请", TrendsTypeEnum.REQUEST_SUBMIT);
trendsApi.createTrends(id, "request_repleinsh_main", "提交了补料申请", TrendsTypeEnum.REQUEST_SUBMIT, String.valueOf(getLoginUserId()));
return repleinshRequestMainMapper.updateById(mainDO);
}
@ -458,7 +459,7 @@ public class RepleinshRequestMainServiceImpl implements RepleinshRequestMainServ
throw new ServiceException(REPLEINSH_REQUEST_STATUS_ERROR);
}
mainDO.setStatus(requestStatusState.getState().getCode());
trendsApi.createTrends(id, "request_repleinsh_main", "驳回了补料申请", TrendsTypeEnum.REQUEST_REFUSED);
trendsApi.createTrends(id, "request_repleinsh_main", "驳回了补料申请", TrendsTypeEnum.REQUEST_REFUSED, String.valueOf(getLoginUserId()));
return repleinshRequestMainMapper.updateById(mainDO);
}
@ -482,7 +483,7 @@ public class RepleinshRequestMainServiceImpl implements RepleinshRequestMainServ
if (RequestStatusEnum.HANDLING.getCode().equals(mainDO.getStatus())) {
this.splitType(mainDO, repleinshRequestDetailMapper.selectList(mainDO.getId()));
}
trendsApi.createTrends(id, "request_repleinsh_main", "审批通过了补料申请", TrendsTypeEnum.REQUEST_AGREE);
trendsApi.createTrends(id, "request_repleinsh_main", "审批通过了补料申请", TrendsTypeEnum.REQUEST_AGREE, String.valueOf(getLoginUserId()));
return repleinshRequestMainMapper.updateById(mainDO);
}
@ -504,7 +505,7 @@ public class RepleinshRequestMainServiceImpl implements RepleinshRequestMainServ
mainDO.setStatus(requestStatusState.getState().getCode());
// 调用执行方法
this.splitType(mainDO, repleinshRequestDetailMapper.selectList(mainDO.getId()));
trendsApi.createTrendsByTask(id, "request_repleinsh_main", "执行了补料申请", TrendsTypeEnum.REQUEST_HANDLE,mainDO.getCreator());
trendsApi.createTrendsByTask(id, "request_repleinsh_main", "执行了补料申请", TrendsTypeEnum.REQUEST_HANDLE, String.valueOf(getLoginUserId()));
int updateCnt = repleinshRequestMainMapper.updateById(mainDO);
if (updateCnt == 0) {
throw exception(PLEASE_DO_NOT_RESUBMIT);
@ -702,7 +703,7 @@ public class RepleinshRequestMainServiceImpl implements RepleinshRequestMainServ
mainDO.setStatus(RequestStatusEnum.PARTIAL.getCode());
mainDO.setRemark("【" + detailDO.getItemCode() + "】该物料推荐库存扣除预计出后，无有效库存");
repleinshRequestMainMapper.updateById(mainDO);
trendsApi.createTrendsByTask(mainDO.getId(), "job_repleinsh_main", "【" + detailDO.getItemCode() + "】该物料推荐库存扣除预计出后，无有效库存", TrendsTypeEnum.CREATE,detailDO.getCreator());
trendsApi.createTrendsByTask(mainDO.getId(), "job_repleinsh_main", "【" + detailDO.getItemCode() + "】该物料推荐库存扣除预计出后，无有效库存", TrendsTypeEnum.CREATE, String.valueOf(getLoginUserId()));
// 该处return 只限于当前循环 主表仍insert入 用事务回滚方式 对于申请表修改还要继续 最后 用删除主信息来做
// repleinshJobMainMapper.deleteById(repleinshJobMainDO);
return;
@ -817,7 +818,7 @@ public class RepleinshRequestMainServiceImpl implements RepleinshRequestMainServ
expectinService.createExpectin(expectinCreateReqVOList);
// 增加预计出
expectoutService.createExpectout(expectoutCreateReqVOList);
trendsApi.createTrendsByTask(repleinshJobMainDO.getId(), "job_repleinsh_main", "补料申请生成补料任务", TrendsTypeEnum.CREATE,repleinshJobMainDO.getCreator());
trendsApi.createTrends(repleinshJobMainDO.getId(), "job_repleinsh_main", null, "补料申请生成补料任务", JSONUtil.toJsonStr(repleinshJobMainDO), TrendsTypeEnum.CREATE, String.valueOf(getLoginUserId()));
// 创建 翻包申请 修改 在补料任务执行后 创建 20240811 cxm 转移到任务执行处理
// Map<String, Object> map = new HashMap<>();
// map.put("repleinshJobMainDO", repleinshJobMainDO);
@ -958,7 +959,7 @@ public class RepleinshRequestMainServiceImpl implements RepleinshRequestMainServ
mainDO.setStatus(RequestStatusEnum.PARTIAL.getCode());
mainDO.setRemark("【" + detailDO.getItemCode() + "】该物料推荐库存扣除预计出后，无有效库存");
repleinshRequestMainMapper.updateById(mainDO);
trendsApi.createTrends(mainDO.getId(), "job_repleinsh_main", "【" + detailDO.getItemCode() + "】该物料推荐库存扣除预计出后，无有效库存", TrendsTypeEnum.CREATE);
trendsApi.createTrends(mainDO.getId(), "job_repleinsh_main", "【" + detailDO.getItemCode() + "】该物料推荐库存扣除预计出后，无有效库存", TrendsTypeEnum.CREATE, String.valueOf(getLoginUserId()));
return null;
}
// 当有推荐时，更新备注信息
@ -1020,7 +1021,7 @@ public class RepleinshRequestMainServiceImpl implements RepleinshRequestMainServ
expectinService.createExpectin(expectinCreateReqVOList);
// 增加预计出
expectoutService.createExpectout(expectoutCreateReqVOList);
trendsApi.createTrends(repleinshJobMainDO.getId(), "job_repleinsh_main", "补料申请生成补料任务", TrendsTypeEnum.CREATE);
trendsApi.createTrends(repleinshJobMainDO.getId(), "job_repleinsh_main", null, "补料申请生成补料任务", JSONUtil.toJsonStr(repleinshJobMainDO), TrendsTypeEnum.CREATE, String.valueOf(getLoginUserId()));
// 消息通知
NotifySendSingleToRoleReqDTO notifySendSingleToRoleReqDTO = new NotifySendSingleToRoleReqDTO();
@ -1115,7 +1116,7 @@ public class RepleinshRequestMainServiceImpl implements RepleinshRequestMainServ
mainDO.setStatus(RequestStatusEnum.PARTIAL.getCode());
mainDO.setRemark("【" + item.getItemCode() + "】该物料推荐库存扣除预计出后，无有效库存");
repleinshRequestMainMapper.updateById(mainDO);
trendsApi.createTrends(mainDO.getId(), "job_repleinsh_main", "【" + item.getItemCode() + "】该物料推荐库存扣除预计出后，无有效库存", TrendsTypeEnum.CREATE);
trendsApi.createTrends(mainDO.getId(), "job_repleinsh_main", "【" + item.getItemCode() + "】该物料推荐库存扣除预计出后，无有效库存", TrendsTypeEnum.CREATE, String.valueOf(getLoginUserId()));
return ;
}
// 当有推荐时，更新备注信息
@ -1176,7 +1177,7 @@ public class RepleinshRequestMainServiceImpl implements RepleinshRequestMainServ
expectinService.createExpectin(expectinCreateReqVOList);
// 增加预计出
expectoutService.createExpectout(expectoutCreateReqVOList);
trendsApi.createTrends(repleinshJobMainDO.getId(), "job_repleinsh_main", "补料申请生成补料任务", TrendsTypeEnum.CREATE);
trendsApi.createTrends(repleinshJobMainDO.getId(), "job_repleinsh_main", null, "补料申请生成补料任务", JSONUtil.toJsonStr(repleinshJobMainDO), TrendsTypeEnum.CREATE, String.valueOf(getLoginUserId()));
// 消息通知
NotifySendSingleToRoleReqDTO notifySendSingleToRoleReqDTO = new NotifySendSingleToRoleReqDTO();

Write Preview
Loading…
Cancel
Save