Browse Source

新旧序列号校验

master
han\hanst 2 weeks ago
parent
commit
cc83425d5f
  1. 6
      src/main/java/com/xujie/sys/modules/pms/controller/EamController.java
  2. 2
      src/main/java/com/xujie/sys/modules/pms/mapper/EamMapper.java
  3. 2
      src/main/java/com/xujie/sys/modules/pms/service/EamService.java
  4. 5
      src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java
  5. 25
      src/main/resources/mapper/pms/EamMapper.xml

6
src/main/java/com/xujie/sys/modules/pms/controller/EamController.java

@ -2417,6 +2417,12 @@ public class EamController {
return R.ok(); return R.ok();
} }
@PostMapping("/getCoreSerialLatestAction")
public R getCoreSerialLatestAction(@RequestBody EamWorkOrderCoreComponentsData inData){
String action = eamService.getCoreSerialLatestAction(inData);
return R.ok().put("data", action == null ? "" : action);
}
@PostMapping("/deleteCoreComponents") @PostMapping("/deleteCoreComponents")
public R deleteCoreComponents(@RequestBody EamWorkOrderCoreComponentsData inData){ public R deleteCoreComponents(@RequestBody EamWorkOrderCoreComponentsData inData){
eamService.deleteCoreComponents(inData); eamService.deleteCoreComponents(inData);

2
src/main/java/com/xujie/sys/modules/pms/mapper/EamMapper.java

@ -468,6 +468,8 @@ public interface EamMapper {
List<EamWorkOrderCoreComponentsData> getCoreComponentByNo(EamWorkOrderCoreComponentsData inData); List<EamWorkOrderCoreComponentsData> getCoreComponentByNo(EamWorkOrderCoreComponentsData inData);
String getCoreSerialLatestAction(EamWorkOrderCoreComponentsData inData);
void updateCoreComponent(EamWorkOrderCoreComponentsData inData); void updateCoreComponent(EamWorkOrderCoreComponentsData inData);
List<BusinessRoleVo> getRoleByUserName(BusinessRoleVo data); List<BusinessRoleVo> getRoleByUserName(BusinessRoleVo data);

2
src/main/java/com/xujie/sys/modules/pms/service/EamService.java

@ -1144,6 +1144,8 @@ public interface EamService {
void saveCoreComponent(EamWorkOrderCoreComponentsData inData); void saveCoreComponent(EamWorkOrderCoreComponentsData inData);
String getCoreSerialLatestAction(EamWorkOrderCoreComponentsData inData);
PageUtils queryEamDocumentType(Page<EamDocumentTypeData> pages, QuerySavedVo querySavedVo); PageUtils queryEamDocumentType(Page<EamDocumentTypeData> pages, QuerySavedVo querySavedVo);
PageUtils queryBuDocument(Page<EamBuDocumentListDefinitionVo> pages, QuerySavedVo querySavedVo); PageUtils queryBuDocument(Page<EamBuDocumentListDefinitionVo> pages, QuerySavedVo querySavedVo);

5
src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java

@ -3501,6 +3501,11 @@ public class EamServiceImpl implements EamService {
} }
} }
@Override
public String getCoreSerialLatestAction(EamWorkOrderCoreComponentsData inData) {
return eamMapper.getCoreSerialLatestAction(inData);
}
/** /**
* 维修出库 * 维修出库
* @param partSpareData * @param partSpareData

25
src/main/resources/mapper/pms/EamMapper.xml

@ -3997,6 +3997,31 @@
where site = #{site} and bu_no = #{buNo} and OrderNo = #{orderNo} and partNo = #{partNo} where site = #{site} and bu_no = #{buNo} and OrderNo = #{orderNo} and partNo = #{partNo}
</select> </select>
<select id="getCoreSerialLatestAction" resultType="java.lang.String" parameterType="com.xujie.sys.modules.pms.entity.EamWorkOrderCoreComponentsData">
SELECT TOP 1 tempData.action
FROM (
SELECT
created_date,
'下机' AS action
FROM eam_workOrder_coreComponents
WHERE site = #{site} and bu_no = #{buNo} and partNo = #{partNo} and oldSerialNo = #{serialNo}
<if test="orderNo != null and orderNo != ''">
and OrderNo != #{orderNo}
</if>
UNION ALL
SELECT
created_date,
'上机' AS action
FROM eam_workOrder_coreComponents
WHERE site = #{site} and bu_no = #{buNo} and partNo = #{partNo} and newSerialNo = #{serialNo}
<if test="orderNo != null and orderNo != ''">
and OrderNo != #{orderNo}
</if>
) tempData
ORDER BY tempData.created_date DESC,
CASE WHEN tempData.action = '上机' THEN 0 ELSE 1 END
</select>
<select id="getRoleByUserName" resultType="com.xujie.sys.modules.factory.entity.vo.BusinessRoleVo" parameterType="com.xujie.sys.modules.factory.entity.vo.BusinessRoleVo"> <select id="getRoleByUserName" resultType="com.xujie.sys.modules.factory.entity.vo.BusinessRoleVo" parameterType="com.xujie.sys.modules.factory.entity.vo.BusinessRoleVo">
SELECT SELECT
a.site, a.site,

Loading…
Cancel
Save