rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/WmsErpController.java
@@ -1,7 +1,4 @@ package com.vincent.rsf.openApi.controller; import com.vincent.rsf.framework.common.R; import com.vincent.rsf.framework.exception.CoolException; import com.vincent.rsf.openApi.entity.dto.CommonResponse; import com.vincent.rsf.openApi.entity.params.ErpMatnrParms; rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/impl/WmsErpServiceImpl.java
@@ -69,7 +69,14 @@ if (result.getCode() == 200) { JSONObject object = JSONObject.parseObject(JSONObject.toJSONString(result.getData())); OrderDto dto = new OrderDto(); dto.setOrderNo(object.getString("code")).setAnfme(object.getDouble("anfme")).setType(object.getString("type")).setWkType(object.getString("wkType")).setQty(object.getDouble("qty")).setPoCode(object.getString("poCode")).setExceStatus(object.getShort("exceStatus")).setWorkQty(object.getDouble("workQty")); dto.setOrderNo(object.getString("code")) .setAnfme(object.getDouble("anfme")) .setType(object.getString("type")) .setWkType(object.getString("wkType")) .setQty(object.getDouble("qty")) .setPoCode(object.getString("poCode")) .setExceStatus(object.getShort("exceStatus")) .setWorkQty(object.getDouble("workQty")); result.setData(dto); return result; } else { rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/ReportMsgController.java
@@ -43,7 +43,7 @@ return R.error("上报明细不能为空！！"); } return reportMsgService.reportOrders(params); return reportMsgService.uploadReportOrders(params); }
@@ -17,5 +17,5 @@ boolean reportInspectNotify(List<PoItemsDto> items); R reportOrders(ReportParams params); R uploadReportOrders(ReportParams params); } rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java
@@ -225,8 +225,7 @@ @Override public R queryOrderStatus(QueryOrderParam queryParams) { WkOrder wkOrders = asnOrderService.getOne(new LambdaQueryWrapper<WkOrder>() .eq(WkOrder::getCode, queryParams.getOrderNo()) .eq(StringUtils.isNotBlank(queryParams.getType()), WkOrder::getType, queryParams.getType())); .eq(WkOrder::getPoCode, queryParams.getOrderNo())); if (Objects.isNull(wkOrders)) { throw new CoolException("单据不存在！！"); } @@ -761,17 +760,18 @@ } Matnr matnr = matnrService.getOne(new LambdaQueryWrapper<Matnr>().eq(Matnr::getCode, baseMatParms.getMatnr())); if (Objects.isNull(matnr)) { BeanUtils.copyProperties(baseMatParms, matnr); matnr.setCode(baseMatParms.getMatnr()); matnr.setName(baseMatParms.getMaktx()); Matnr matnr1 = new Matnr(); BeanUtils.copyProperties(baseMatParms, matnr1); matnr1.setCode(baseMatParms.getMatnr()); matnr1.setName(baseMatParms.getMaktx()); if (!Objects.isNull(baseMatParms.getGroupName())) { MatnrGroup matnrGroup = matnrGroupService.getOne(new LambdaQueryWrapper<MatnrGroup>() .eq(MatnrGroup::getName, baseMatParms.getGroupName())); if (Objects.isNull(matnrGroup)) { matnr.setGroupCode(matnrGroup.getCode()).setGroupId(matnrGroup.getId()); if (!Objects.isNull(matnrGroup)) { matnr1.setGroupCode(matnrGroup.getCode()).setGroupId(matnrGroup.getId()); } } if (!matnrService.save(matnr)) { if (!matnrService.save(matnr1)) { throw new CoolException("物料新增失败！！"); } } else { rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReportMsgServiceImpl.java
@@ -183,7 +183,7 @@ * @return com.vincent.rsf.framework.common.R */ @Override public R reportOrders(ReportParams params) { public R uploadReportOrders(ReportParams params) { if (Objects.isNull(params)) { throw new CoolException("参数不能为空！！"); } rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/AsnOrderLogSchedule.java
@@ -183,13 +183,20 @@ }); params.setData(reportData); R reported = reportMsgService.reportOrders(params); R reported = reportMsgService.uploadReportOrders(params); if (reported.get("code").equals(200)) { order.setNtyStatus(1); if (!asnOrderService.updateById(order)) { throw new CoolException("上报状态修改失败！！"); } } try { //休眠3秒 Thread.sleep(3000); } catch (InterruptedException e) { throw new RuntimeException(e); } }); }
@@ -25,7 +25,7 @@ # global-config: # field-strategy: 0 configuration: # log-impl: org.apache.ibatis.logging.stdout.StdOutImpl log-impl: org.apache.ibatis.logging.stdout.StdOutImpl map-underscore-to-camel-case: true cache-enabled: true call-setters-on-nulls: true
