suojin
/
jonhon-mes-svr
22
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://42.192.7.176:3000/suojin/jonhon-mes-svr into liweidong

Browse Source
liweidong
liweidong-hj 3 weeks ago
parent 58d4e9aa7a 052207ed7e
commit 266181e6a1
7 changed files with 62 additions and 52 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. 7
      blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/MaterialQuota.java
  2. 4
      blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsPartServiceImpl.java
  3. 51
      blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskingServiceImpl.java
  4. 1
      blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankController.java
  5. 4
      blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/LiquidTankServiceImpl.java
  6. 5
      blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/LiquidTankTaskServiceImpl.java
  7. 42
      blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ReviewSheetServiceImpl.java

7
blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/MaterialQuota.java
Unescape View File

@ -4,6 +4,8 @@
package org.springblade.desk.basic.pojo.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.NullSerializer;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@ -83,26 +85,31 @@ public class MaterialQuota extends BaseEntity {
* 镀层厚度
*/
@Schema(description = "镀层厚度")
@JsonSerialize(nullsUsing = NullSerializer.class)
private BigDecimal thickness;
/**
* 定额
*/
@Schema(description = "定额")
@JsonSerialize(nullsUsing = NullSerializer.class)
private BigDecimal quota;
/**
* 小批量定额
*/
@Schema(description = "小批量定额")
@JsonSerialize(nullsUsing = NullSerializer.class)
private BigDecimal smallBatQuota;
/**
* 大批量定额
*/
@Schema(description = "大批量定额")
@JsonSerialize(nullsUsing = NullSerializer.class)
private BigDecimal bigBatQuota;
/**
* 局部镀定额
*/
@JsonSerialize(nullsUsing = NullSerializer.class)
@Schema(description = "局部镀定额")
private BigDecimal localBatQuota;
/**

4
blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsPartServiceImpl.java
Unescape View File

@ -394,7 +394,9 @@ public class DsPartServiceImpl extends BaseServiceImpl<DsPartMapper, DsPartEntit
updateById(dsPart);
if (!TaskingConstant.IS_SINTERING.equals(dsPart.getIsSintering())) {
if ((org.apache.commons.lang3.StringUtils.isNotBlank(dsPart.getCraftWay()) && dsPart.getCraftWay().contains("4"))) {
getErpDataPartClient().sendingPartGiveErp(dsPart);
// todo getErpDataPartClient().sendingPartGiveErp(dsPart);
}
}
if (!CollectionUtils.isEmpty(zPartList)) {

51
blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskingServiceImpl.java
Unescape View File

@ -1811,15 +1811,13 @@ public class DsTaskingServiceImpl extends BaseServiceImpl<DsTaskingMapper, DsTas
item.setId(null);
item.setProcessId(dsProcessEntity.getId());
});
if(CollectionUtils.isEmpty(processProjectList)){
log.info("零件 {} 没有检验项目数据", newPart.getPartCode());
return true;
}
boolean processProjectSaveBatch = processProjectService.saveBatch(processProjectList);
if (!processProjectSaveBatch) {
log.error("项目同步失败，oldMesProcessId:{}", oldMesProcessId);
// 继续处理下一个工艺，不中断
continue;
if(!CollectionUtils.isEmpty(processProjectList)){
boolean processProjectSaveBatch = processProjectService.saveBatch(processProjectList);
if (!processProjectSaveBatch) {
log.error("项目同步失败，oldMesProcessId:{}", oldMesProcessId);
// 继续处理下一个工艺，不中断
continue;
}
}
//尺寸量具
@ -1828,33 +1826,30 @@ public class DsTaskingServiceImpl extends BaseServiceImpl<DsTaskingMapper, DsTas
item.setId(null);
item.setProcessId(dsProcessEntity.getId());
});
if(CollectionUtils.isEmpty(processMeasuringToolList)){
log.info("零件 {} 没有尺寸量具数据", newPart.getPartCode());
return true;
}
boolean measuringToolSaveBatch = processMeasuringToolService.saveBatch(processMeasuringToolList);
if (!measuringToolSaveBatch) {
log.error("尺寸量具同步失败，oldMesProcessId:{}", oldMesProcessId);
// 继续处理下一个工艺，不中断
continue;
if(!CollectionUtils.isEmpty(processMeasuringToolList)){
boolean measuringToolSaveBatch = processMeasuringToolService.saveBatch(processMeasuringToolList);
if (!measuringToolSaveBatch) {
log.error("尺寸量具同步失败，oldMesProcessId:{}", oldMesProcessId);
// 继续处理下一个工艺，不中断
continue;
}
}
//工装
List<DsProcessMoldToolEntity> processMoldToolEntityList = processMoldToolService.selectOldMesByPid(oldMesProcessId);
processMoldToolEntityList.forEach(item -> {
processMoldToolEntityList.forEach(item -> {
item.setId(null);
item.setProcessId(dsProcessEntity.getId());
});
if(CollectionUtils.isEmpty(processMoldToolEntityList)){
log.info("零件 {} 没有工装数据", newPart.getPartCode());
return true;
}
boolean processMoldToolSaveBatch = processMoldToolService.saveBatch(processMoldToolEntityList);
if(!processMoldToolSaveBatch){
log.error("工装同步失败，oldMesProcessId:{}", oldMesProcessId);
// 继续处理下一个工艺，不中断
continue;
if(!CollectionUtils.isEmpty(processMoldToolEntityList)){
boolean processMoldToolSaveBatch = processMoldToolService.saveBatch(processMoldToolEntityList);
if(!processMoldToolSaveBatch){
log.error("工装同步失败，oldMesProcessId:{}", oldMesProcessId);
// 继续处理下一个工艺，不中断
continue;
}
}
}
}

1
blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankController.java
Unescape View File

@ -113,6 +113,7 @@ public class LiquidTankController extends BladeController {
public R<IPage<LiquidTankVO>> list(@Parameter(hidden = true) @RequestParam Map<String, Object> liquidTank,
Query query) {
QueryWrapper<LiquidTank> qw = Condition.getQueryWrapper(liquidTank, LiquidTank.class);
qw.orderByDesc("CREATE_TIME");
IPage<LiquidTank> pages = service.page(Condition.getPage(query), qw);
IPage<LiquidTankVO> pagesVO = LiquidTankWrapper.build().pageVO(pages);

4
blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/LiquidTankServiceImpl.java
Unescape View File

@ -118,7 +118,7 @@ public class LiquidTankServiceImpl extends BaseServiceImpl<LiquidTankMapper, Liq
} catch (Exception e) {
return R.fail("周期为月的每月数据格式不正确");
}
if (Integer.parseInt(month)>=1 && Integer.parseInt(month)<=12) {
if (Integer.parseInt(month)>=1 && Integer.parseInt(month)<=31) {
} else {
return R.fail("周期为月的每月数据格式不正确");
}
@ -135,7 +135,7 @@ public class LiquidTankServiceImpl extends BaseServiceImpl<LiquidTankMapper, Liq
for (String date : yearList) {
List< String> dates = Arrays.asList(date.split("/"));
List< String> dates = Arrays.asList(date.split("-"));
String month = dates.get(0);
String day = dates.get(1);

5
blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/LiquidTankTaskServiceImpl.java
Unescape View File

@ -42,6 +42,7 @@ import org.springblade.desk.basic.util.IdUtil;
import org.springblade.desk.quality.util.JobExtUtil;
import org.springblade.system.feign.IDictClient;
import org.springblade.system.feign.IUserClient;
import org.springblade.system.pojo.entity.User;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -467,6 +468,10 @@ public class LiquidTankTaskServiceImpl extends BaseServiceImpl<LiquidTankTaskMap
}
// todo:判断条件
boolean toAccept = true;
R<User> user = userClient.userInfoById(task.getTestUserId());
if(null == user || null == user.getData() || user.getData().getId() == null){
toAccept = false;
}
// 状态
if (toAccept) {
task.setStatus(LiquidTankTaskConst.S_PENDING_ACCEPT);

42
blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ReviewSheetServiceImpl.java
Unescape View File

@ -426,28 +426,28 @@ public class ReviewSheetServiceImpl extends EnBaseServiceImpl<ReviewSheetMapper,
vofs.add(vofDTO);
}
JSONObject obj = new JSONObject();
obj.put("qmsRepairApplyDTO", dto);
obj.put("qmsRepairPartList", vods);
obj.put("qmsRepairMalfList", vofs);
HttpEntity<JSONObject> entity = new HttpEntity<>(obj, headers);
ResponseEntity<JSONObject> responseEntity;
JSONObject responseBody;
try {
// responseEntity = httpClientTemplate.postForEntity("http://192.168.119.68:10113" +
// JSONObject obj = new JSONObject();
// obj.put("qmsRepairApplyDTO", dto);
// obj.put("qmsRepairPartList", vods);
// obj.put("qmsRepairMalfList", vofs);
// HttpEntity<JSONObject> entity = new HttpEntity<>(obj, headers);
// ResponseEntity<JSONObject> responseEntity;
// JSONObject responseBody;
// try {
//// responseEntity = httpClientTemplate.postForEntity("http://192.168.119.68:10113" +
//// "/api/mms/qms/qmsrepairapply/qmsRepairApplyRest/saveQmsRepairApply/v1", entity, JSONObject.class);
//
// responseEntity = httpClientTemplate.postForEntity(newErpUrl +
// "/api/mms/qms/qmsrepairapply/qmsRepairApplyRest/saveQmsRepairApply/v1", entity, JSONObject.class);
responseEntity = httpClientTemplate.postForEntity(newErpUrl +
"/api/mms/qms/qmsrepairapply/qmsRepairApplyRest/saveQmsRepairApply/v1", entity, JSONObject.class);
JSONObject result = responseEntity.getBody();
responseBody = result.getJSONObject("responseBody");
if (responseBody == null) {
throw new BusinessException("审理单,接口返回值null");
}
} catch (Exception e) {
throw new RuntimeException("审理单,接口返回值null");
}
// JSONObject result = responseEntity.getBody();
//
// responseBody = result.getJSONObject("responseBody");
// if (responseBody == null) {
// throw new BusinessException("审理单,接口返回值null");
// }
// } catch (Exception e) {
// throw new RuntimeException("审理单,接口返回值null");
// }
}
return R.success("成功");
}

Write Preview
Loading…
Cancel
Save