aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-05-28 00:19:16 +08:00
parent b4d9849b1f
commit 8b5ec512eb
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisElectronicPagApplyController.java
View File

@ -144,11 +144,16 @@ public class EmisElectronicPagApplyController extends BaseController
@PreAuthorize("@ss.hasPermi('emis:emisElectronicPagApply:send')")
@Log(title = "网点电子面单发放", businessType = BusinessType.UPDATE)
@PutMapping("/sendByCenter")
public AjaxResult sendByCenter(String prefix,String matialCode,String useSiteCode,Integer applyNum)
public AjaxResult sendByCenter(@RequestBody EmisElectronicPagApply emisElectronicPagApply)
{
try {
String prefix=emisElectronicPagApply.getPrefix();
String matialCode=emisElectronicPagApply.getMaterialCode();
String useSiteCode=emisElectronicPagApply.getApplySiteCode();
Integer applyNum=emisElectronicPagApply.getApplyCount();
String remark=emisElectronicPagApply.getRemark();
// prefix="T7080";
return toAjax(emisElectronicPagService.sendByCenter(useSiteCode,matialCode,"T7080",applyNum));
return toAjax(emisElectronicPagService.sendByCenter(useSiteCode,matialCode,"T7080",applyNum,remark));
}catch (Exception ex){
ex.printStackTrace();
// 返回子定义异常
@ -165,13 +170,14 @@ public class EmisElectronicPagApplyController extends BaseController
*/
@PreAuthorize("@ss.hasPermi('emis:emisElectronicPagApply:cancel')")
@Log(title = "网点电子面单取消", businessType = BusinessType.UPDATE)
@PutMapping("/cancel")
public AjaxResult cancel(@RequestBody EmisElectronicPagApply emisElectronicPagApply)
@PutMapping("/cancelApply")
public AjaxResult cancelApply(@RequestBody EmisElectronicPagApply emisElectronicPagApply)
{
emisElectronicPagApply.setCancelDate(new Date());
emisElectronicPagApply.setCancelManCode(getLoginUser().getUser().getEmpCode());
emisElectronicPagApply.setCancelSiteCode(getLoginUser().getUser().getOwnerSiteCode());
emisElectronicPagApply.setBlCancel("1");
emisElectronicPagApply.preUpdate();
return toAjax(emisElectronicPagApplyService.updateEmisElectronicPagApply(emisElectronicPagApply));
}

2
emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisElectronicPagService.java
View File

@ -47,7 +47,7 @@ public interface IEmisElectronicPagService
* @return
* @throws EmisBizError
*/
public int sendByCenter(String applySiteCode,String materialCode,String prefix,Integer applyNum) throws EmisBizError;
public int sendByCenter(String applySiteCode,String materialCode,String prefix,Integer applyNum,String remark) throws EmisBizError;
/**
* 查询电子面单列表

2
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisElectronicPagServiceImpl.java
View File

@ -185,7 +185,7 @@ public class EmisElectronicPagServiceImpl extends EmisBaseService implements IEm
*/
@Transactional
@Override
public int sendByCenter(String applySiteCode,String materialCode,String prefix,Integer applyNum) throws EmisBizError {
public int sendByCenter(String applySiteCode,String materialCode,String prefix,Integer applyNum,String remark) throws EmisBizError {
// 生成流水号
String nowStr=DateUtils.parseDateToStr(DateUtils.YYYYMMDDHHMMSS,new Date());