root/rl_mg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 与调用mes数据库的问题

Browse Source
This commit is contained in:
liyongde
2023-10-24 15:05:37 +08:00
parent 0a779f2b00
commit 0b37e66ac8
10 changed files with 28 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
View File

@@ -441,7 +441,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
*/
@Override
public ApplyTaskResponse applyLabelling(JSONObject param) {
// 木托盘号##物料编码##数量##吨量（单重X数量）##生产日期##订单号
// 木托盘号##物料编码##数量##吨量（单重X数量）##生产日期##客户名称##订单号
String requestNo = param.getString("requestNo");
ApplyTaskRequest baseRequest = param.toJavaObject(ApplyTaskRequest.class);
if (baseRequest.getVehicle_code() == null) {
@@ -469,7 +469,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
.append(multiply).append("##")
.append(DateUtil.format(DateUtil.parse(DateUtil.today()), "yyyy年MM月dd日")).append("##")
.append(custer.getCUSTER_NAME()).append("##")
.append(object.getString("order_no"));
.append(workorder.getProduction_order());
return ApplyTaskResponse.responseOk(requestNo, sb.toString());
}

3
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/WmsToMesService.java
View File

@@ -63,6 +63,7 @@ public interface WmsToMesService {
List<MesGdyInfoDto> getAllMesGdyInfos();
/**
* 统计当前设备的不合格位置的数量作为不合格数
* 上报压机判废信息
* @param workorderCode
*/
@@ -111,5 +112,5 @@ public interface WmsToMesService {
* @param currentSize
* @return
*/
List<MesOrderInfo> selectPageMesOrder(int currentPage, int currentSize);
List<MesOrderInfo> selectPageMesOrder(String materialId, int currentPage, int currentSize);
}

2
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dao/mapper/MesRequestMapper.java
View File

@@ -65,5 +65,5 @@ public interface MesRequestMapper {
@DS("oracle")
CusterVo getCusterByNo(String custerNo);
@DS("oracle")
List<MesOrderInfo> selectPageMesOrder(int currentPage, int currentSize);
List<MesOrderInfo> selectPageMesOrder(String materialId, int currentPage, int currentSize);
}

7
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dao/mapper/MesRequestMapper.xml
View File

@@ -282,10 +282,10 @@
WHERE p1.region_code = 'GTPHC'
</select>
<select id="getCusterInfo" resultType="org.nl.wms.ext.mes.service.dto.CusterVo">
SELECT * FROM "RTMG"."VIEW_CUSTER_LMS"
SELECT CUSTER_NO, CUSTER_NAME FROM "RTMG"."VIEW_CUSTER_LMS"
</select>
<select id="getCusterByNo" resultType="org.nl.wms.ext.mes.service.dto.CusterVo">
SELECT * FROM "RTMG"."VIEW_CUSTER_LMS"
SELECT CUSTER_NO, CUSTER_NAME FROM "RTMG"."VIEW_CUSTER_LMS"
WHERE CUSTER_NO = #{custerNo}
</select>
<select id="selectPageMesOrder" resultType="org.nl.wms.ext.mes.service.dto.MesOrderInfo">
@@ -295,6 +295,9 @@
"RTMG"."VIEW_POP_ORDER_RESULT_LMS".*
FROM "RTMG"."VIEW_POP_ORDER_RESULT_LMS"
WHERE ROWNUM <![CDATA[ <= ]]> #{currentSize}
<if test="materialId != null">
AND FMATERIAL_ID = #{materialId}
</if>
)
WHERE rn <![CDATA[ > ]]> #{currentPage}
</select>

4
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/impl/WmsToMesServiceImpl.java
View File

@@ -419,8 +419,8 @@ public class WmsToMesServiceImpl implements WmsToMesService {
}
@Override
public List<MesOrderInfo> selectPageMesOrder(int currentPage, int currentSize) {
return mesRequestMapper.selectPageMesOrder(currentPage, currentSize);
public List<MesOrderInfo> selectPageMesOrder(String materialId, int currentPage, int currentSize) {
return mesRequestMapper.selectPageMesOrder(materialId, currentPage, currentSize);
}
/**

3
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/impl/PdmBdWorkorderServiceImpl.java
View File

@@ -113,6 +113,7 @@ public class PdmBdWorkorderServiceImpl extends ServiceImpl<PdmBdWorkorderMapper,
res.put("custer_no", entity.getCuster_no());
entity.setPlan_qty(ceil > inventoryCeil ? BigDecimal.valueOf(inventoryCeil) : BigDecimal.valueOf(ceil));
entity.setExt_data(res.toJSONString());
entity.setProduce_order(entity.getOrder_no());
}
@Override
@@ -224,7 +225,7 @@ public class PdmBdWorkorderServiceImpl extends ServiceImpl<PdmBdWorkorderMapper,
IPage<MesOrderInfo> pages = new Page<>(page, size);
int currentPage = page * size;
int currentSize = pageQuery.getPage() == 0 ? 1 : pageQuery.getPage() * size;
List<MesOrderInfo> mesOrderInfoList = wmsToMesService.selectPageMesOrder(currentPage, currentSize);
List<MesOrderInfo> mesOrderInfoList = wmsToMesService.selectPageMesOrder(query.getMaterialId(), currentPage, currentSize);
pages.setRecords(mesOrderInfoList);
return pages;
}

6
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/ReportService.java
View File

@@ -19,6 +19,12 @@ public interface ReportService {
IPage<IOKilnReportVo> inKilnReport(Map json, PageQuery page);
/**
* 物料警告
* @param json
* @param page
* @return
*/
IPage<MaterialTimeoutVo> inventoryMaterialTimeoutWarning(Map json, PageQuery page);
// IPage<> mudTransfer(JSONObject json, PageQuery page);

2
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/dao/mapper/ReportMapper.xml
View File

@@ -59,6 +59,6 @@
WHERE p.region_code = 'GTPHC'
AND p.point_type = '2'
AND p.point_status = '3'
AND vg.instorage_time <![CDATA[<=]]> DATE_SUB(NOW(), INTERVAL 7 DAY)
AND vg.instorage_time <![CDATA[<=]]> DATE_SUB(NOW(), INTERVAL 30 DAY)
</select>
</mapper>

2
lms/nladmin-ui/src/views/wms/pdm/workerorder/ProductionOrder.vue
View File

@@ -60,7 +60,7 @@ export default {
url: 'api/pdmBdWorkorder/mesOrder',
optShow: {},
query: {
material_code: null
materialId: null
}
})
},

12
lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue
View File

@@ -226,15 +226,15 @@
/>
</el-form-item>
<el-form-item v-if="form.region_code === 'FJ'" label="客户编码">
<el-select v-model="form.custer_no" placeholder="请选择" style="width: 240px;">
<el-select v-model="form.custer_no" clearable filterable placeholder="请选择" style="width: 240px;">
<el-option
v-for="item in custerList"
:key="item.CUSTER_NO"
:label="item.CUSTER_NAME"
:value="item.CUSTER_NO"
:key="item.custer_NO"
:label="item.custer_NAME"
:value="item.custer_NO"
>
<span style="float: left">{{ item.CUSTER_NO }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.CUSTER_NAME }}</span>
<span style="float: left">{{ item.custer_NO }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.custer_NAME }}</span>
</el-option>
</el-select>
</el-form-item>