diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/AppRun.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/AppRun.java
index 98c70a9..7537460 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/AppRun.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/AppRun.java
@@ -5,6 +5,7 @@ import com.alicp.jetcache.anno.config.EnableCreateCacheAnnotation;
import com.alicp.jetcache.anno.config.EnableMethodCache;
import io.swagger.annotations.Api;
import org.mybatis.spring.annotation.MapperScan;
+import org.nl.common.annotation.Limit;
import org.nl.config.SpringContextHolder;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -59,6 +60,7 @@ public class AppRun {
* @return /
*/
@GetMapping("/")
+ @Limit(period = 2, count = 1)
@SaIgnore
public String index() {
return "Backend service started successfully";
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/notice/impl/SysNoticeServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/notice/impl/SysNoticeServiceImpl.java
index c2d0d1d..2443148 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/notice/impl/SysNoticeServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/notice/impl/SysNoticeServiceImpl.java
@@ -160,7 +160,7 @@ public class SysNoticeServiceImpl extends ServiceImpl<SysNoticeMapper, SysNotice
@Override
public void createNotice(String msg, String title, String type) {
- log.info("创建消息通知-信息：{}, 标题：{}, 类型：{}", msg, title, type);
+// log.info("创建消息通知-信息：{}, 标题：{}, 类型：{}", msg, title, type);
// 获取标题相同的信息
List<SysNotice> sysNotices = sysNoticeMapper.selectList(new LambdaQueryWrapper<SysNotice>()
.eq(SysNotice::getNotice_title, title)
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/brick/service/impl/MdBaseBrickInfoServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/brick/service/impl/MdBaseBrickInfoServiceImpl.java
index 50aa495..63e855d 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/brick/service/impl/MdBaseBrickInfoServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/brick/service/impl/MdBaseBrickInfoServiceImpl.java
@@ -68,6 +68,8 @@ public class MdBaseBrickInfoServiceImpl extends ServiceImpl<MdBaseBrickInfoMappe
@Override
public void addBrickInfo(BrickInfoDto dto) {
MdBaseBrickInfo brickInfo = toBrickInfoMapper(dto);
+ PdmBdWorkorder workorder = workorderService.getDeviceProductionTask(brickInfo.getGet_station());
+ brickInfo.setWorkorder_code(workorder.getWorkorder_code());
mdBaseBrickInfoMapper.insert(brickInfo);
// todo：上传mes
wmsToMesService.reportBrickInfo(brickInfo);
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/controller/MdBaseMaterialController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/controller/MdBaseMaterialController.java
index fb79a67..f842443 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/controller/MdBaseMaterialController.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/controller/MdBaseMaterialController.java
@@ -3,6 +3,7 @@ package org.nl.wms.database.material.controller;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
+import org.nl.common.annotation.Limit;
import org.nl.common.base.TableDataInfo;
import org.nl.common.domain.query.PageQuery;
import org.nl.common.logging.annotation.Log;
@@ -70,6 +71,7 @@ public class MdBaseMaterialController {
@PostMapping("/synchronize")
@Log("物料同步")
@ApiOperation("物料同步")
+ @Limit(period = 1, count = 1)
//@SaCheckPermission("materialtype:list")
public ResponseEntity<Object> synchronize(@RequestBody Map whereJson) {
wmsToMesService.synchronizeMaterialInfo();
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/IMdBaseMaterialService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/IMdBaseMaterialService.java
index c10220d..35eac06 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/IMdBaseMaterialService.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/IMdBaseMaterialService.java
@@ -45,5 +45,11 @@ public interface IMdBaseMaterialService extends IService<MdBaseMaterial> {
MdBaseMaterial findByCode(String materialCode);
+ /**
+ * 获取库存物料
+ * @param whereJson
+ * @param page
+ * @return
+ */
IPage<MdBaseMaterial> queryByInventory(MdBaseMaterialQuery whereJson, PageQuery page);
}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/dao/mapper/MdBaseMaterialMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/dao/mapper/MdBaseMaterialMapper.xml
index 11784a3..aba29b8 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/dao/mapper/MdBaseMaterialMapper.xml
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/dao/mapper/MdBaseMaterialMapper.xml
@@ -14,7 +14,8 @@
`md_base_material` mm
LEFT JOIN sch_base_vehiclematerialgroup vg ON vg.material_id = mm.material_id
LEFT JOIN sch_base_point p ON p.vehicle_code = vg.vehicle_code AND p.vehicle_type = vg.vehicle_type
- WHERE vg.group_bind_material_status = '2' AND p.region_code = 'GTPHC' AND p.point_status = '3'
+ LEFT JOIN pdm_bd_workorder wo ON wo.region_code = 'FJ' AND wo.material_id = mm.material_id AND wo.workorder_status = '3'
+ WHERE vg.group_bind_material_status = '2' AND p.region_code = 'GTPHC' AND p.point_status = '3' AND wo.workorder_code IS NOT NULL
<if test="query.blurry != null">
AND (mm.material_code LIKE '%${query.blurry}%' OR mm.material_name LIKE '%${query.blurry}%')
</if>
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/WmsToMesService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/WmsToMesService.java
index e2c8aab..18b5b88 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/WmsToMesService.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/WmsToMesService.java
@@ -56,10 +56,22 @@ public interface WmsToMesService {
*/
void reportGdyMaterialInfoOut(String groupId);
+ /**
+ * 获取所有滚筒线内数据
+ * @return
+ */
List<MesSemiProductionInfo> getAllMesSemiProductionInfos();
+ /**
+ * 插入MES数据库
+ * @param obj
+ */
void saveSemiProductionBatchToMes(MesSemiProductionInfo obj);
+ /**
+ * 获取当前窑内信息
+ * @return
+ */
List<MesGdyInfoDto> getAllMesGdyInfos();
/**
@@ -113,4 +125,11 @@ public interface WmsToMesService {
* @return
*/
List<MesOrderInfo> selectPageMesOrder(String materialId, int currentPage, int currentSize);
+
+ /**
+ * 获取总数
+ * @param materialId
+ * @return
+ */
+ int getTotal(String materialId);
}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dao/mapper/MesRequestMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dao/mapper/MesRequestMapper.java
index 3fa55f2..6bdcfad 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dao/mapper/MesRequestMapper.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dao/mapper/MesRequestMapper.java
@@ -66,4 +66,12 @@ public interface MesRequestMapper {
CusterVo getCusterByNo(String custerNo);
@DS("oracle")
List<MesOrderInfo> selectPageMesOrder(String materialId, int currentPage, int currentSize);
+
+ /**
+ * 获取当前物料的订单总数
+ * @param materialId
+ * @return
+ */
+ @DS("oracle")
+ int getOrderTotalByMaterial(String materialId);
}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dao/mapper/MesRequestMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dao/mapper/MesRequestMapper.xml
index 227defe..c2a5872 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dao/mapper/MesRequestMapper.xml
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dao/mapper/MesRequestMapper.xml
@@ -289,16 +289,36 @@
WHERE CUSTER_NO = #{custerNo}
</select>
<select id="selectPageMesOrder" resultType="org.nl.wms.ext.mes.service.dto.MesOrderInfo">
- SELECT *
- FROM (
- SELECT ROWNUM AS rn,
- "RTMG"."VIEW_POP_ORDER_RESULT_LMS".*
- FROM "RTMG"."VIEW_POP_ORDER_RESULT_LMS"
- WHERE ROWNUM <![CDATA[ <= ]]> #{currentSize}
+ SELECT
+ FORDER_NO,
+ FPLANSTART_DATE,
+ FPLANFINISH_DATE,
+ FMATERIAL_ID,
+ FMATERIAL_NAME,
+ FMATSPEC,
+ FSALE_NO,
+ FORDER_SUBNUM,
+ BC,
+ BZ,
+ GUADANSUM
+ FROM
+ "RTMG"."VIEW_POP_ORDER_RESULT_LMS"
+ WHERE
+ ROWNUM <![CDATA[ >= ]]> #{currentPage}
+ AND ROWNUM <![CDATA[ <= ]]> #{currentSize}
<if test="materialId != null">
AND FMATERIAL_ID = #{materialId}
</if>
- )
- WHERE rn <![CDATA[ > ]]> #{currentPage}
+ </select>
+ <select id="getOrderTotalByMaterial" resultType="java.lang.Integer">
+ SELECT
+ COUNT( * ) AS total_count
+ FROM
+ "RTMG"."VIEW_POP_ORDER_RESULT_LMS"
+ <where>
+ <if test="materialId != null">
+ FMATERIAL_ID = #{materialId}
+ </if>
+ </where>
</select>
</mapper>
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/impl/WmsToMesServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/impl/WmsToMesServiceImpl.java
index db444ce..0f88d5d 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/impl/WmsToMesServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/impl/WmsToMesServiceImpl.java
@@ -423,6 +423,11 @@ public class WmsToMesServiceImpl implements WmsToMesService {
return mesRequestMapper.selectPageMesOrder(materialId, currentPage, currentSize);
}
+ @Override
+ public int getTotal(String materialId) {
+ return mesRequestMapper.getOrderTotalByMaterial(materialId);
+ }
+
/**
* 转换
*
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/controller/PdmBdWorkorderController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/controller/PdmBdWorkorderController.java
index 0bfa9a1..f759e4d 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/controller/PdmBdWorkorderController.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/controller/PdmBdWorkorderController.java
@@ -3,6 +3,7 @@ package org.nl.wms.pdm.workorder.controller;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
+import org.nl.common.annotation.Limit;
import org.nl.common.base.TableDataInfo;
import org.nl.common.domain.query.PageQuery;
import org.nl.common.logging.annotation.Log;
@@ -103,6 +104,7 @@ public class PdmBdWorkorderController {
@PostMapping("/synchronize")
@Log("工单同步")
@ApiOperation("工单同步")
+ @Limit(period = 1, count = 1)
//@SaCheckPermission("materialtype:list")
public ResponseEntity<Object> synchronize(@RequestBody Map whereJson) {
wmsToMesService.synchronizeWorkOrderInfo();
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/impl/PdmBdWorkorderServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/impl/PdmBdWorkorderServiceImpl.java
index 8b09cec..687b348 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/impl/PdmBdWorkorderServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/impl/PdmBdWorkorderServiceImpl.java
@@ -16,6 +16,8 @@ import org.nl.common.exception.BadRequestException;
import org.nl.common.utils.CodeUtil;
import org.nl.common.utils.SecurityUtils;
import org.nl.system.service.notice.ISysNoticeService;
+import org.nl.wms.database.material.service.IMdBaseMaterialService;
+import org.nl.wms.database.material.service.dao.MdBaseMaterial;
import org.nl.wms.ext.acs.service.WmsToAcsService;
import org.nl.wms.ext.acs.service.dto.to.wms.AcsResponse;
import org.nl.wms.ext.mes.service.WmsToMesService;
@@ -60,6 +62,8 @@ public class PdmBdWorkorderServiceImpl extends ServiceImpl<PdmBdWorkorderMapper,
@Autowired
private WmsToMesService wmsToMesService;
@Autowired
+ private IMdBaseMaterialService materialService;
+ @Autowired
private ISchBaseVehiclematerialgroupService vehiclematerialgroupService;
@Override
@@ -97,6 +101,11 @@ public class PdmBdWorkorderServiceImpl extends ServiceImpl<PdmBdWorkorderMapper,
* @param entity
*/
private void toCalculatePlannedQuantity(PdmBdWorkorder entity) {
+ // 获取物料
+ MdBaseMaterial material = materialService.getById(entity.getMaterial_id());
+ if (ObjectUtil.isEmpty(material.getPack_method()) || ObjectUtil.isEmpty(material.getPack_palletspec())) {
+ throw new BadRequestException("创建工单失败，物料[" + entity.getMaterial_id() + "]包装规格为空，请维护！");
+ }
int orderSubnum = entity.getOrder_subnum(); // 计划量
int guadansum = entity.getGuadansum(); // 已经包装数
int residueNum = orderSubnum - guadansum; // 剩余数
@@ -220,13 +229,15 @@ public class PdmBdWorkorderServiceImpl extends ServiceImpl<PdmBdWorkorderMapper,
@Override
public IPage<MesOrderInfo> queryMesOrder(PdmBdWorkorderQuery query, PageQuery pageQuery) {
- Integer page = pageQuery.getPage() + 1;
+ Integer page = pageQuery.getPage();
Integer size = pageQuery.getSize();
IPage<MesOrderInfo> pages = new Page<>(page, size);
- int currentPage = page * size;
- int currentSize = pageQuery.getPage() == 0 ? 1 : pageQuery.getPage() * size;
+ int currentPage = page * size + 1; // start
+ int currentSize = (pageQuery.getPage() + 1) * size; // end
List<MesOrderInfo> mesOrderInfoList = wmsToMesService.selectPageMesOrder(query.getMaterialId(), currentPage, currentSize);
pages.setRecords(mesOrderInfoList);
+ int total = wmsToMesService.getTotal(query.getMaterialId());
+ pages.setTotal(total);
return pages;
}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/ISchBaseVehiclematerialgroupService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/ISchBaseVehiclematerialgroupService.java
index b438c31..cdc01bf 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/ISchBaseVehiclematerialgroupService.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/ISchBaseVehiclematerialgroupService.java
@@ -86,4 +86,11 @@ public interface ISchBaseVehiclematerialgroupService extends IService<SchBaseVeh
* @return
*/
int getInventoryQtyByMaterialId(String materialId);
+
+ /**
+ * 解绑同载具的信息
+ * @param vehicleCode
+ * @param vehicleType
+ */
+ void unBindingSameVehicleMaterial(String vehicleCode, String vehicleType);
}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/impl/SchBaseVehiclematerialgroupServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/impl/SchBaseVehiclematerialgroupServiceImpl.java
index b33a32b..55b292f 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/impl/SchBaseVehiclematerialgroupServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/impl/SchBaseVehiclematerialgroupServiceImpl.java
@@ -26,12 +26,15 @@ import org.nl.wms.sch.group.service.dao.SchBaseVehiclematerialgroup;
import org.nl.wms.sch.group.service.dto.SchBaseVehiclematerialgroupQuery;
import org.nl.wms.sch.point.service.ISchBasePointService;
import org.nl.wms.sch.point.service.dao.SchBasePoint;
+import org.nl.wms.sch.task_manage.enums.GroupBindMaterialStatusEnum;
import org.nl.wms.sch.task_manage.enums.GroupStatusEnum;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.function.Consumer;
/**
* @description 服务实现
@@ -134,4 +137,17 @@ public class SchBaseVehiclematerialgroupServiceImpl extends ServiceImpl<SchBaseV
return vehiclematerialgroupMapper.getInventoryQtyByMaterialId(materialId);
}
+ @Override
+ public void unBindingSameVehicleMaterial(String vehicleCode, String vehicleType) {
+ LambdaQueryWrapper<SchBaseVehiclematerialgroup> lambda = new QueryWrapper<SchBaseVehiclematerialgroup>().lambda();
+ lambda.eq(SchBaseVehiclematerialgroup::getVehicle_code, vehicleCode)
+ .eq(SchBaseVehiclematerialgroup::getVehicle_type, vehicleType)
+ .ne(SchBaseVehiclematerialgroup::getGroup_bind_material_status, GroupBindMaterialStatusEnum.UNBOUND.getValue())
+ .eq(SchBaseVehiclematerialgroup::getIs_delete, false);
+ List<SchBaseVehiclematerialgroup> list = vehiclematerialgroupMapper.selectList(lambda);
+ list.forEach(schBaseVehiclematerialgroup ->
+ schBaseVehiclematerialgroup.setGroup_bind_material_status(GroupBindMaterialStatusEnum.UNBOUND.getValue()));
+ this.updateBatchById(list);
+ }
+
}
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJMKTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJMKTask.java
index e0ed435..a88ce94 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJMKTask.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJMKTask.java
@@ -67,6 +67,7 @@ public class FJMKTask extends AbstractTask {
private ISchBaseVehiclematerialgroupService vehiclematerialgroupService;
@Autowired
private WmsToAcsService wmsToAcsService;
+
@Override
protected void create() throws BadRequestException {
// 获取任务
@@ -116,7 +117,7 @@ public class FJMKTask extends AbstractTask {
// 大于两托正常，大于1托给1，小于1托给2
// 5 校验是否够码满一托/两托
// 大于等于2就可以码
- if (total/needFullNumber >= 2) {
+ if (total / needFullNumber >= 2) {
/** 覆膜机木托盘位 */
SchBasePoint LaminatePoint = findStartPoint(startRegionStr, jsonObject);
if (ObjectUtil.isEmpty(LaminatePoint)) {
@@ -234,12 +235,10 @@ public class FJMKTask extends AbstractTask {
PdmBdWorkorder workorderObject = workorderService.getDeviceProductionTask(basePoint.getParent_point_code());
String vehicleType = workorderObject.getVehicle_type(); // 从工单上获取
// 找到相同组盘信息就直接返回id，避免任务取消组盘信息还存在，重复插入
- SchBaseVehiclematerialgroup groupEntity = vehiclematerialgroupService.getGroupInfo(vehicleCode, vehicleType,
- GroupBindMaterialStatusEnum.BOUND.getValue(), workorderObject.getMaterial_id());
- if (groupEntity == null) {
- groupEntity = new SchBaseVehiclematerialgroup();
- groupEntity.setGroup_id(IdUtil.getSnowflake(1, 1).nextIdStr());
- }
+ // 解绑同载具的信息
+ vehiclematerialgroupService.unBindingSameVehicleMaterial(vehicleCode, vehicleType);
+ SchBaseVehiclematerialgroup groupEntity = new SchBaseVehiclematerialgroup();
+ groupEntity.setGroup_id(IdUtil.getSnowflake(1, 1).nextIdStr());
// 要把数据存到组盘表
groupEntity.setMaterial_id(ObjectUtil.isNotEmpty(workorderObject)
? workorderObject.getMaterial_id()
@@ -274,6 +273,7 @@ public class FJMKTask extends AbstractTask {
/**
* 从覆膜区找个空木托盘
+ *
* @param startRegionStr
* @param extData
* @return
@@ -298,6 +298,7 @@ public class FJMKTask extends AbstractTask {
/**
* 从包装线找个位置放货
+ *
* @param nextRegionStr
* @param requestParam
* @return
@@ -416,6 +417,7 @@ public class FJMKTask extends AbstractTask {
TaskUtils.setUpdateByType(taskObj, taskFinishedType);
taskService.updateById(taskObj);
}
+
public void cancelTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) {
// 获取参数
String bzxPoint = taskObj.getPoint_code2(); // 获取终点1
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJQZRKTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJQZRKTask.java
index 3337f4c..c98ba2e 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJQZRKTask.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJQZRKTask.java
@@ -147,13 +147,10 @@ public class FJQZRKTask extends AbstractTask {
PdmBdWorkorder workorderObject = workorderService.getDeviceProductionTask(basePoint.getParent_point_code());
String vehicleType = workorderObject.getVehicle_type();
// 找到相同组盘信息就直接返回id，避免任务取消组盘信息还存在，重复插入
+ // 解绑同载具的信息
+ vehiclematerialgroupService.unBindingSameVehicleMaterial(vehicleCode, vehicleType);
SchBaseVehiclematerialgroup groupEntity = new SchBaseVehiclematerialgroup();
groupEntity.setGroup_id(IdUtil.getSnowflake(1, 1).nextIdStr());
- SchBaseVehiclematerialgroup groupObject = vehiclematerialgroupService.getGroupInfo(vehicleCode, vehicleType,
- GroupBindMaterialStatusEnum.BOUND.getValue(), workorderObject.getMaterial_id());
- if (groupObject != null) {
- groupEntity = groupObject;
- }
// 要把数据存到组盘表
groupEntity.setMaterial_id(ObjectUtil.isNotEmpty(workorderObject)
? workorderObject.getMaterial_id()
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJRKTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJRKTask.java
index 351d168..d60ce19 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJRKTask.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJRKTask.java
@@ -217,13 +217,10 @@ public class FJRKTask extends AbstractTask {
PdmBdWorkorder workorderObject = workorderService.getDeviceProductionTask(basePoint.getParent_point_code());
String vehicleType = workorderObject.getVehicle_type();
// 找到相同组盘信息就直接返回id，避免任务取消组盘信息还存在，重复插入
+ // 解绑同载具的信息
+ vehiclematerialgroupService.unBindingSameVehicleMaterial(vehicleCode, vehicleType);
SchBaseVehiclematerialgroup groupEntity = new SchBaseVehiclematerialgroup();
groupEntity.setGroup_id(IdUtil.getSnowflake(1, 1).nextIdStr());
- SchBaseVehiclematerialgroup groupObject = vehiclematerialgroupService.getGroupInfo(vehicleCode, vehicleType,
- GroupBindMaterialStatusEnum.BOUND.getValue(), workorderObject.getMaterial_id());
- if (groupObject != null) {
- groupEntity = groupObject;
- }
// 要把数据存到组盘表
groupEntity.setMaterial_id(ObjectUtil.isNotEmpty(workorderObject)
? workorderObject.getMaterial_id()
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/HNMLTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/HNMLTask.java
index cec966d..5d477fc 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/HNMLTask.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/HNMLTask.java
@@ -329,12 +329,10 @@ public class HNMLTask extends AbstractTask {
}
// 找到相同组盘信息就直接返回id，避免任务取消组盘信息还存在，重复插入
// 找到不直接返回，用那条数据进行修改
- SchBaseVehiclematerialgroup groupEntity = vehiclematerialgroupService.getGroupInfo(vehicleCode, vehicleType,
- GroupBindMaterialStatusEnum.BOUND.getValue());
- if (groupEntity == null) {
- groupEntity = new SchBaseVehiclematerialgroup();
- groupEntity.setGroup_id(IdUtil.getSnowflake(1, 1).nextIdStr());
- }
+ // 解绑同载具的信息
+ vehiclematerialgroupService.unBindingSameVehicleMaterial(vehicleCode, vehicleType);
+ SchBaseVehiclematerialgroup groupEntity = new SchBaseVehiclematerialgroup();
+ groupEntity.setGroup_id(IdUtil.getSnowflake(1, 1).nextIdStr());
// 要把数据存到组盘表
groupEntity.setMaterial_id(GeneralDefinition.UNKNOWN); // 物料标识等任务完成后赋值
groupEntity.setRedundance_material_code(materialCode);
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZSLTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZSLTask.java
index d15e170..df31d1e 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZSLTask.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZSLTask.java
@@ -252,11 +252,8 @@ public class YZSLTask extends AbstractTask {
// 找到相同组盘信息就修改，避免任务取消组盘信息还存在，重复插入
SchBaseVehiclematerialgroup groupEntity = new SchBaseVehiclematerialgroup();
groupEntity.setGroup_id(IdUtil.getSnowflake(1, 1).nextIdStr());
- SchBaseVehiclematerialgroup groupObject = vehiclematerialgroupService.getGroupInfo(vehicleCode, vehicleType,
- GroupBindMaterialStatusEnum.WAIT_BIND.getValue(), workorderObject.getMaterial_id());
- if (groupObject != null) {
- groupEntity = groupObject;
- }
+ // 解绑同载具的信息
+ vehiclematerialgroupService.unBindingSameVehicleMaterial(vehicleCode, vehicleType);
// 要把数据存到组盘表
groupEntity.setMaterial_id(ObjectUtil.isNotEmpty(workorderObject)
? workorderObject.getMaterial_id()
diff --git a/lms/nladmin-system/nlsso-server/src/main/resources/stopword.dic b/lms/nladmin-system/nlsso-server/src/main/resources/stopword.dic
index 2c94dd1..7f748f1 100644
--- a/lms/nladmin-system/nlsso-server/src/main/resources/stopword.dic
+++ b/lms/nladmin-system/nlsso-server/src/main/resources/stopword.dic
@@ -1254,3 +1254,4 @@ $
压机产出-获取MES给的工单数据
压机产出返给MES的数据
反馈压机产出插入mes数据库失败
+插入压机检测失败
diff --git a/lms/nladmin-ui/src/views/wms/pdm/workerorder/ProductionOrder.vue b/lms/nladmin-ui/src/views/wms/pdm/workerorder/ProductionOrder.vue
index 844a004..862b37c 100644
--- a/lms/nladmin-ui/src/views/wms/pdm/workerorder/ProductionOrder.vue
+++ b/lms/nladmin-ui/src/views/wms/pdm/workerorder/ProductionOrder.vue
@@ -28,12 +28,17 @@
<el-radio v-model="tableRadio" :label="scope.row"><i /></el-radio>
</template>
</el-table-column>
- <el-table-column prop="FORDER_NO" label="订单号" width="160" />
- <el-table-column prop="FORDER_SUBNUM" label="总数量" width="160" />
- <el-table-column prop="GUADANSUM" label="包装数量" width="160" />
- <el-table-column prop="FMATERIAL_NAME" label="物料名称" width="180" show-overflow-tooltip />
- <el-table-column prop="FMATSPEC" label="物料规格" width="140" />
- <el-table-column prop="FMATMODEL" label="物料型号" width="130px" />
+ <el-table-column prop="forder_NO" label="订单号" width="160" />
+ <el-table-column prop="forder_SUBNUM" label="订单数量" width="160" />
+ <el-table-column prop="guadansum" label="订单已挂单数量" width="160" />
+ <el-table-column label="所需数量" width="160" >
+ <template slot-scope="scope">
+ {{scope.row.forder_SUBNUM - scope.row.guadansum}}
+ </template>
+ </el-table-column>
+ <el-table-column prop="fmaterial_NAME" label="物料名称" width="180" show-overflow-tooltip />
+ <el-table-column prop="bc" label="NCC计划类型" width="140" />
+ <el-table-column prop="bz" label="交货期" width="140" />
</el-table>
<!--分页组件-->
<pagination />
diff --git a/lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue b/lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue
index bdb3c92..10ccd14 100644
--- a/lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue
+++ b/lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue
@@ -614,9 +614,9 @@ export default {
},
recordMesOrder(row) { // 操作mes工单
this.clearRecordMesOrder()
- this.form.order_no = row.FORDER_NO
- this.form.order_subnum = row.FORDER_SUBNUM
- this.form.guadansum = row.GUADANSUM
+ this.form.order_no = row.forder_NO
+ this.form.order_subnum = row.forder_SUBNUM
+ this.form.guadansum = row.guadansum
},
setRegionName(data) {
// 清空