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

Browse Source 
# Conflicts:
#	blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StBuyOrderServiceImpl.java
liweidong
pangyang 3 weeks ago
parent e67362a3d2 895696fcd0
commit ad140ef72b
8 changed files with 45 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. 16
      blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskingServiceImpl.java
  2. 2
      blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkOrderMapper.xml
  3. 25
      blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java
  4. 2
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/EquipAbilityMapper.xml
  5. 2
      blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java
  6. 6
      blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StComboxController.java
  7. 2
      blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StGoodsController.java
  8. 10
      blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StBuyOrderServiceImpl.java

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

@ -1787,6 +1787,7 @@ public class DsTaskingServiceImpl extends BaseServiceImpl<DsTaskingMapper, DsTas
for (DsProcessEntity dsProcessEntity : oldMesProcessList) {
Long oldMesProcessId = dsProcessEntity.getId();
dsProcessEntity.setId(null);
dsProcessEntity.setCraftId(oldCraft.getId());
boolean processSave = processService.save(dsProcessEntity);
if (!processSave) {
log.error("工序同步失败，oldMesProcessId:{}", oldMesProcessId);
@ -1796,7 +1797,10 @@ public class DsTaskingServiceImpl extends BaseServiceImpl<DsTaskingMapper, DsTas
// 处理项目尺寸量具
//项目
List<DsProcessProjectEntity> processProjectList = processProjectService.selectOldMesByPid(oldMesProcessId);
processProjectList.forEach(item -> item.setId(null));
processProjectList.forEach(item -> {
item.setId(null);
item.setProcessId(dsProcessEntity.getId());
});
if(CollectionUtils.isEmpty(processProjectList)){
log.info("零件 {} 没有检验项目数据", newPart.getPartCode());
return true;
@ -1810,7 +1814,10 @@ public class DsTaskingServiceImpl extends BaseServiceImpl<DsTaskingMapper, DsTas
//尺寸量具
List<DsProcessMeasuringToolEntity> processMeasuringToolList = processMeasuringToolService.selectOldMesByPid(oldMesProcessId);
processMeasuringToolList.forEach(item -> item.setId(null));
processMeasuringToolList.forEach(item -> {
item.setId(null);
item.setProcessId(dsProcessEntity.getId());
});
if(CollectionUtils.isEmpty(processMeasuringToolList)){
log.info("零件 {} 没有尺寸量具数据", newPart.getPartCode());
return true;
@ -1824,7 +1831,10 @@ public class DsTaskingServiceImpl extends BaseServiceImpl<DsTaskingMapper, DsTas
//工装
List<DsProcessMoldToolEntity> processMoldToolEntityList = processMoldToolService.selectOldMesByPid(oldMesProcessId);
processMoldToolEntityList.forEach(item -> item.setId(null));
processMoldToolEntityList.forEach(item -> {
item.setId(null);
item.setProcessId(dsProcessEntity.getId());
});
if(CollectionUtils.isEmpty(processMoldToolEntityList)){
log.info("零件 {} 没有工装数据", newPart.getPartCode());
return true;

2
blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkOrderMapper.xml
Unescape View File

@ -54,7 +54,7 @@
mwo.MES_CARD_NO mesCardNo,
myo.PLATE plate,
myo.PRODUCT_TYPE productType,
myo.PRIORITY_ERP priority,
mwo.PRIORITY priority,
myo.USE_DEPT useDept,
ROUND(myo.YP_AREA * mwo.MAKE_QTY,10) totalArea,
myo.YP_AREA area,

25
blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java
Unescape View File

@ -18,12 +18,10 @@ import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.desk.basic.constant.FlowConst;
import org.springblade.desk.basic.pojo.entity.BsAssignEntity;
import org.springblade.desk.basic.pojo.entity.OemCraftAbilityEntity;
import org.springblade.desk.basic.pojo.entity.WorkCenter;
import org.springblade.desk.basic.service.IOemCraftAbilityService;
import org.springblade.desk.basic.service.IOemService;
import org.springblade.desk.basic.service.IProcessAbilityService;
import org.springblade.desk.basic.service.IWorkCenterService;
import org.springblade.desk.basic.service.*;
import org.springblade.desk.dashboard.pojo.entity.BsProcessSetEntity;
import org.springblade.desk.dashboard.pojo.entity.BsTeamSetEntity;
import org.springblade.desk.dashboard.pojo.entity.DsPartEntity;
@ -142,6 +140,8 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
private final IWorkCenterService workCenterService;
private final IBsAssignService bsAssignService;
@Override
public IPage<WorkOrderVO> selectWorkOrderPage(IPage<WorkOrderVO> page, WorkOrderDTO workOrder) {
return page.setRecords(baseMapper.selectWorkOrderPage(page, workOrder));
@ -413,8 +413,19 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
wpr.setWorkOrderRun(CollectionUtils.isNotEmpty(workOrderRuns) ? workOrderRuns.get(0) : null);
wpr.setOrders(wp.getOrders());
wpr.setMakeMemo(wp.getMakeMemo());
// 不可外协原因
wpr.setReason("测试");
// 不可外协原因：
// 先判断该工艺能力是否可以查到必须厂内的分派规则，如果有返回【工序不可外协】
// 在判断该工艺能力是否可以找到对应的外协厂商，如果没有返回【无对应工艺能力厂商】
wpr.setReason("无");
long count = bsAssignService.count(Wrappers.lambdaQuery(BsAssignEntity.class).eq(BsAssignEntity::getCraftAbilityId, wp.getCaId()).eq(BsAssignEntity::getLimitType, BsAssignEntity.MUST).eq(BsAssignEntity::getPointType, BsAssignEntity.IN_FACTORY));
if (count > 0) {
wpr.setReason("工序不可外协");
} else {
oemCraftAbilityService.count(Wrappers.lambdaQuery(OemCraftAbilityEntity.class).eq(OemCraftAbilityEntity::getCraftAbilityId, wp.getCaId()));
if (count == 0) {
wpr.setReason("无对应工艺能力厂商");
}
}
wprList.add(wpr);
}
@ -1689,7 +1700,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
@Override
public boolean updatePriority(UpdatePriorityDTO updatePriorityDTO) {
WorkOrder wo = this.getById(updatePriorityDTO.getWoId());
wo.setPriority(WorkOrder.PRIORITY_SCH_IMP);
// wo.setPriority(WorkOrder.PRIORITY_SCH_IMP);
wo.setPriority(updatePriorityDTO.getPriority());
wo.setDemandDate(updatePriorityDTO.getDemandDate());
boolean b = this.updateById(wo);

2
blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/EquipAbilityMapper.xml
Unescape View File

@ -38,7 +38,7 @@
and equip_code = #{param2.equipCode}
</if>
</where>
order by update_time desc
order by work_center_id,equip_name,equip_code,equip_type,update_time desc
</select>

2
blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java
Unescape View File

@ -643,7 +643,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
}
workPlan.setPlanEndTime(workPlan.getPlanEndTime().plusMinutes(personHours.longValue()));
}
workPlan.setWorkQty(order.getYpQty());
workPlan.setWorkQty(0);
workPlan.setCaId(craft.getCaId());
workPlan.setPpsId(craft.getPpsId());
workPlan.setMakeTeam(equipResource.getTeamId());

6
blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StComboxController.java
Unescape View File

@ -116,13 +116,11 @@ public class StComboxController {
.or()
.like("goods_name", filterValue));
}
qw.eq("is_deleted", false);
// 2. 数据权限：当前用户工厂（可选）
BladeUser user = AuthUtil.getUser();
/*BladeUser user = AuthUtil.getUser();
if (user != null && user.getDeptId() != null) {
qw.eq("create_dept", user.getDeptId());
}
}*/
// 3. 分页查询
IPage<StGoods> page = stGoodsService.page(Condition.getPage(query), qw);

2
blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StGoodsController.java
Unescape View File

@ -92,7 +92,7 @@ public class StGoodsController extends BladeController {
@ApiOperationSupport(order = 4)
@ApiLog("物料信息表 新增")
@Operation(summary = "新增", description = "传入stGoods")
public R save(@Valid @RequestBody String goodsCode) throws Exception{
public R save(@RequestParam String goodsCode) throws Exception{
stGoodsService.saveGoods(goodsCode);
return R.success();
}

10
blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StBuyOrderServiceImpl.java
Unescape View File

@ -106,10 +106,15 @@ public class StBuyOrderServiceImpl extends BaseServiceImpl<StBuyOrderMapper, StB
// 采购部门：固定编码0200
Dept buyDept = SysCache.getDeptByCode("0200");
newBuyOrder.setBuyDept(buyDept.getId());
if(buyDept != null){
newBuyOrder.setBuyDept(buyDept.getId());
}
// 需求部门：固定编码3400
Dept needDept = SysCache.getDeptByCode("3400");
newBuyOrder.setNeedDept(needDept.getId());
if(needDept != null){
newBuyOrder.setNeedDept(needDept.getId());
}
// ===== 3. 日期默认值：当前系统时间 (原逻辑不变)
newBuyOrder.setDeclareDate(currDate);
@ -183,6 +188,7 @@ public class StBuyOrderServiceImpl extends BaseServiceImpl<StBuyOrderMapper, StB
approvalRecord.setNextRoleName("保管员");
//租户ID 000000
R<String> roleIdResp = sysClient.getRoleIds("000000", approvalRecord.getNextRoleName());
R<String> roleIdResp = sysClient.getRoleIds("000000", approvalRecord.getNextRoleName());
String roleId = roleIdResp.getData();
approvalRecord.setNextRoleId(Long.valueOf(roleId));
mesApprovalRecordClient.save(approvalRecord);

Write Preview
Loading…
Cancel
Save