wilson
/
rongxing-java
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity
Browse Source

消息提示多语言 purchasingManagement 2023年1月29日 sxm

master
[li_she] 3 years ago
parent
4b506a7885
commit
d3e2bc408a
2 changed files with 32 additions and 30 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
      src/main/java/com/gaotao/modules/purchasingManagement/controller/MaterialSplitController.java
  2. 54
      src/main/java/com/gaotao/modules/purchasingManagement/service/Impl/MaterialSplitServiceImpl.java

8
src/main/java/com/gaotao/modules/purchasingManagement/controller/MaterialSplitController.java
View File

@ -1,11 +1,11 @@
package com.gaotao.modules.purchasingManagement.controller;
import com.gaotao.common.constant.SysMsgConstant;
import com.gaotao.common.utils.R;
import com.gaotao.modules.pda.utils.ResponseData;
import com.gaotao.modules.purchasingManagement.entity.*;
import com.gaotao.modules.purchasingManagement.service.MaterialSplitService;
import com.gaotao.modules.schedule.data.SearchScheduleData;
import com.gaotao.modules.schedule.data.SfdcMaterialData;
import com.gaotao.modules.sys.controller.AbstractController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.PostMapping;
@ -27,7 +27,7 @@ import java.util.Map;
*/
@Controller
@RequestMapping(value="/materialSplit")
public class MaterialSplitController {
public class MaterialSplitController extends AbstractController {
@Autowired
private MaterialSplitService materialSplitService;
@ -444,7 +444,7 @@ public class MaterialSplitController {
List<Map<String, Object>> resultList = materialSplitService.getPrintCRollInfo(inData);
return R.ok()
.put("code", 200)
.put("msg", "操作成功!")
.put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000))
.put("rows", resultList)
.put("total", resultList.size());
}

54
src/main/java/com/gaotao/modules/purchasingManagement/service/Impl/MaterialSplitServiceImpl.java
View File

@ -1,18 +1,17 @@
package com.gaotao.modules.purchasingManagement.service.Impl;
import com.gaotao.common.constant.SysMsgConstant;
import com.gaotao.common.utils.DateUtil;
import com.gaotao.modules.base.dao.BaseMapper;
import com.gaotao.modules.base.entity.AccessSiteData;
import com.gaotao.modules.base.entity.ProductProcessRouteData;
import com.gaotao.modules.base.entity.SiteData;
import com.gaotao.modules.pda.utils.DateUtils;
import com.gaotao.modules.pda.utils.ResponseData;
import com.gaotao.modules.purchasingManagement.dao.MaterialSplitMapper;
import com.gaotao.modules.purchasingManagement.entity.*;
import com.gaotao.modules.purchasingManagement.service.MaterialSplitService;
import com.gaotao.modules.purchasingManagement.util.EntityBean;
import com.gaotao.modules.schedule.mapper.ProcedureMapper;
import com.gaotao.modules.shopOrder.entity.SOPlannerData;
import com.gaotao.modules.sys.service.SysMsgService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -32,6 +31,9 @@ public class MaterialSplitServiceImpl implements MaterialSplitService {
@Autowired
private MaterialSplitMapper materialSplitMapper;
@Autowired
private SysMsgService sysMsgService;
//============查询-卷信息=========
@Override
public List<SearchRollInformationData> searchRollInformation(SearchRollInformationData indata){
@ -63,13 +65,13 @@ public class MaterialSplitServiceImpl implements MaterialSplitService {
//创建返回打印的数据
List<Map<String, Object>> printList = new ArrayList<>();
if (list3.size() == 0) {
responseData.setMsg("该工厂编码不存在！");
responseData.setMsg(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200032));
responseData.setCode("500");
return responseData;
}
List<AccessSiteData> list = baseMapper.checkAccessSite(inList.get(0).getSite(), inList.get(0).getCreatedBy());
if (list.size() == 0) {
responseData.setMsg("角色没有该工厂的权限！");
responseData.setMsg(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200040));
responseData.setCode("500");
return responseData;
}
@ -102,7 +104,7 @@ public class MaterialSplitServiceImpl implements MaterialSplitService {
responseData.setObj(printList);
responseData.setCode("200");
responseData.setSuccess(true);
responseData.setMsg("操作成功!");
responseData.setMsg(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200000));
return responseData;
}
@Override
@ -116,7 +118,7 @@ public class MaterialSplitServiceImpl implements MaterialSplitService {
materialSplitMapper.doSaveSuppRollNo(inList);
responseData.setCode("200");
responseData.setSuccess(true);
responseData.setMsg("操作成功!");
responseData.setMsg(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200000));
return responseData;
}
@ -165,7 +167,7 @@ public class MaterialSplitServiceImpl implements MaterialSplitService {
cOrderCurrRollData.setRollNo(inData.getRollNo());
List<COrderCurrRollData> checkCOrderCurrRoll =materialSplitMapper.checkCOrderCurrRoll(cOrderCurrRollData);
if(checkCOrderCurrRoll.size()==0){
responseData.setMsg("该该卷记录，不在当前用户/当前订单下！！");
responseData.setMsg(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200140));
responseData.setCode("500");
return responseData;
}
@ -176,9 +178,9 @@ public class MaterialSplitServiceImpl implements MaterialSplitService {
Double totalIssueQty=materialSplitMapper.getTotalQty2(cRollInfoData);
responseData.setCode("200");
responseData.setSuccess(true);
responseData.setMsg("操作成功!");
responseData.setMsg(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200000));
if(unissueQty*currPartWidth>totalIssueQty){
responseData.setMsg("该卷的退料数量大于发料数量，不能继续！");
responseData.setMsg(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200141));
responseData.setCode("500");
return responseData;
}
@ -200,7 +202,7 @@ public class MaterialSplitServiceImpl implements MaterialSplitService {
CheckFinishRollReturn result =new CheckFinishRollReturn();
if(totalQty2>totalIssueQty*(1+materialUsageLimitUp)||totalQty2<totalIssueQty*(1+materialUsageLimitLow)){
result.setSuccessFlag("N");
result.setMessageBox("本派工单上的入库数量超过了上下限度("+materialUsageLimitUp+100+"%/"+materialUsageLimitLow*100+"%)");
result.setMessageBox(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200142)+materialUsageLimitUp+100+"%/"+materialUsageLimitLow*100+"%)");
}else {
result.setSuccessFlag("Y");
}
@ -238,7 +240,7 @@ public class MaterialSplitServiceImpl implements MaterialSplitService {
Double totalIssueQty=materialSplitMapper.getTotalQty2(cRollInfoData);
responseData.setCode("200");
responseData.setSuccess(true);
responseData.setMsg("操作成功!");
responseData.setMsg(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200000));
totalIssueQty=totalIssueQty-unissueQty;
//更改卷的状态
materialSplitMapper.deleteCOrderCurrRoll(cOrderCurrRollData);
@ -286,7 +288,7 @@ public class MaterialSplitServiceImpl implements MaterialSplitService {
materialSplitMapper.saveTransDetail(transwarehouseid,inData.getSite(),transDetailSubData.getTransNo());
responseData.setCode("200");
responseData.setSuccess(true);
responseData.setMsg("操作成功!");
responseData.setMsg(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200000));
responseData.setObj(transHeaderData);
return responseData;
}
@ -342,7 +344,7 @@ public class MaterialSplitServiceImpl implements MaterialSplitService {
materialSplitMapper.saveTransDetail(inData.getSaveList().get(0).getWarehouseid(),inData.getSite(),transNo);
responseData.setCode("200");
responseData.setSuccess(true);
responseData.setMsg("操作成功!");
responseData.setMsg(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200000));
return responseData;
}
@ -357,23 +359,23 @@ public class MaterialSplitServiceImpl implements MaterialSplitService {
cOrderCurrRollData.setUserID(inData.getUser());
List<COrderCurrRollData> check=materialSplitMapper.checkCOrderCurrRoll(cOrderCurrRollData);
if(check.size()>0){
responseData.setMsg("该订单下，该用户下尚有未结单订单，不能扫描新的卷号！");
responseData.setMsg(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200143));
responseData.setCode("500");
return responseData;
}
CRollInfoData cRollInfoData=materialSplitMapper.getCRollInfo(inData);
if(cRollInfoData==null){
responseData.setMsg("该卷号不存在，请重新输入！");
responseData.setMsg(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200144));
responseData.setCode("500");
return responseData;
}
if(!cRollInfoData.getStatusDb().equals("I")){
responseData.setMsg("该卷号不在材料库，无法做出库，请重新输入！");
responseData.setMsg(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200145));
responseData.setCode("500");
return responseData;
}
if(!cRollInfoData.getPartNo().equals(inData.getfGPartNo())){
responseData.setMsg("该卷的物料料号与该分切单的物料料号不一致，无法做出库，请重新输入！");
responseData.setMsg(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200146));
responseData.setCode("500");
return responseData;
}
@ -434,7 +436,7 @@ public class MaterialSplitServiceImpl implements MaterialSplitService {
ResponseData responseData = new ResponseData();
String checkSourceType=materialSplitMapper.getSourceType(inData);
if((!checkSourceType.equals("采购入库"))&&(!checkSourceType.equals("分切入库"))&&(!checkSourceType.equals("期初入库"))){
responseData.setMsg("该卷不是分切入库或者采购入库的卷，不能删除！");
responseData.setMsg(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200147));
responseData.setCode("500");
return responseData;
}
@ -442,7 +444,7 @@ public class MaterialSplitServiceImpl implements MaterialSplitService {
materialSplitMapper.deleteRoll2(inData);
responseData.setCode("200");
responseData.setSuccess(true);
responseData.setMsg("操作成功!");
responseData.setMsg(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200000));
return responseData;
}
@ -452,7 +454,7 @@ public class MaterialSplitServiceImpl implements MaterialSplitService {
ResponseData responseData = new ResponseData();
List<CRollInfoData> list= materialSplitMapper.checkRollStatus(inData);
if(list.size()>0){
responseData.setMsg("该卷的状态不是消耗未同步，不允许更改状态！");
responseData.setMsg(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200148));
responseData.setCode("500");
return responseData;
}
@ -460,7 +462,7 @@ public class MaterialSplitServiceImpl implements MaterialSplitService {
materialSplitMapper.sapSynchronization(inData);
responseData.setCode("200");
responseData.setSuccess(true);
responseData.setMsg("操作成功!");
responseData.setMsg(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200000));
return responseData;
}
@ -470,7 +472,7 @@ public class MaterialSplitServiceImpl implements MaterialSplitService {
ResponseData responseData = new ResponseData();
List<CRollInfoData> list= materialSplitMapper.checkFrozenflag(inData);
if(list.size()>0){
responseData.setMsg("该卷已经被冻结，不允许更改！");
responseData.setMsg(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200149));
responseData.setCode("500");
return responseData;
}
@ -478,7 +480,7 @@ public class MaterialSplitServiceImpl implements MaterialSplitService {
materialSplitMapper.freezing(inData);
responseData.setCode("200");
responseData.setSuccess(true);
responseData.setMsg("操作成功!");
responseData.setMsg(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200000));
return responseData;
}
@ -488,7 +490,7 @@ public class MaterialSplitServiceImpl implements MaterialSplitService {
ResponseData responseData = new ResponseData();
List<CRollInfoData> list= materialSplitMapper.checkFrozenflag(inData);
if(list.size()==0){
responseData.setMsg("该卷已经被冻结，不允许更改！");
responseData.setMsg(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200149));
responseData.setCode("500");
return responseData;
}
@ -496,7 +498,7 @@ public class MaterialSplitServiceImpl implements MaterialSplitService {
materialSplitMapper.notFreezing(inData);
responseData.setCode("200");
responseData.setSuccess(true);
responseData.setMsg("操作成功!");
responseData.setMsg(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200000));
return responseData;
}

Write Preview
Loading…
Cancel
Save