Commit 31c00d4aa4cd3f73d10b4dced774c9372f9e03b9
1 parent
3de79aa2
金蝶回传测试
Showing
3 changed files
with
24 additions
and
8 deletions
src/main/java/com/huaheng/api/jindie/InvokeHelper.java
| ... | ... | @@ -292,6 +292,7 @@ public class InvokeHelper { |
| 292 | 292 | */ |
| 293 | 293 | |
| 294 | 294 | //采购退货单保存 |
| 295 | + @Transactional(rollbackFor = Exception.class) | |
| 295 | 296 | public void purchase_return_save(String referCode) throws Exception { |
| 296 | 297 | ShipmentHeader shipmentHeader = shipmentHeaderService.getOne(new LambdaQueryWrapper<ShipmentHeader>().eq(ShipmentHeader::getReferCode, referCode)); |
| 297 | 298 | List<ShipmentDetail> shipmentDetails = shipmentDetailService.list(new LambdaQueryWrapper<ShipmentDetail>().eq(ShipmentDetail::getReferCode, referCode)); |
| ... | ... | @@ -301,22 +302,27 @@ public class InvokeHelper { |
| 301 | 302 | List<PurchaseReturnSave.DataDTO.ModelDTO.FPURMRBENTRYDTO> fpurmrbentrydtos=new ArrayList<>(); |
| 302 | 303 | |
| 303 | 304 | purchaseReturnSave.setFormid("PUR_MRB"); |
| 304 | - purchaseReturnSave.getData().getModel().setFId(shipmentHeader.getUserDef1()); | |
| 305 | + purchaseReturnSave.getData().getModel().setFId(shipmentHeader.getReferLineId().toString()); | |
| 305 | 306 | |
| 306 | 307 | shipmentDetails.forEach((shipmentDetail)->{ |
| 307 | 308 | //if(StringUtils.isNotEmpty(shipmentHeader.getUserDef1())&&StringUtils.isNotEmpty(shipmentHeader.getUserDef2())&&StringUtils.isNotEmpty(shipmentDetail.getUserDef1())){ |
| 308 | 309 | PurchaseReturnSave.DataDTO.ModelDTO.FPURMRBENTRYDTO fpurmrbentrydto = new PurchaseReturnSave.DataDTO.ModelDTO.FPURMRBENTRYDTO(); |
| 309 | - PurchaseReturnSave.DataDTO.ModelDTO.FPURMRBENTRYDTO.FMaterialIdDTO fMaterialIdDTO = new PurchaseReturnSave.DataDTO.ModelDTO.FPURMRBENTRYDTO.FMaterialIdDTO(); | |
| 310 | + //PurchaseReturnSave.DataDTO.ModelDTO.FPURMRBENTRYDTO.FMaterialIdDTO fMaterialIdDTO = new PurchaseReturnSave.DataDTO.ModelDTO.FPURMRBENTRYDTO.FMaterialIdDTO(); | |
| 310 | 311 | fpurmrbentrydto.setFEntryID(shipmentDetail.getLineId()); |
| 311 | 312 | fpurmrbentrydto.setFrmrealqty(shipmentDetail.getShipQty()); |
| 312 | - fMaterialIdDTO.setFNumber(shipmentDetail.getMaterialCode()); | |
| 313 | - fpurmrbentrydto.setFMaterialId(fMaterialIdDTO); | |
| 313 | + //fMaterialIdDTO.setFNumber(shipmentDetail.getMaterialCode()); | |
| 314 | + //fpurmrbentrydto.setFMaterialId(fMaterialIdDTO); | |
| 314 | 315 | fpurmrbentrydtos.add(fpurmrbentrydto); |
| 315 | 316 | purchaseReturnSave.getData().getModel().setFpurmrbentry(fpurmrbentrydtos); |
| 316 | 317 | // } |
| 317 | 318 | }); |
| 318 | 319 | JSONObject jsonObject = (JSONObject) JSONObject.toJSON(purchaseReturnSave); |
| 319 | - Invoke(JinDieApiUri.PURCHASE_RETURN_SAVE.getApiUri(), jsonObject); | |
| 320 | + Results.ResultDTO.ResponseStatusDTO.SuccessEntitys successEntity = Invoke(JinDieApiUri.PURCHASE_RETURN_SAVE.getApiUri(), jsonObject); | |
| 321 | + Integer id = successEntity.getId(); | |
| 322 | + String number = successEntity.getNumber(); | |
| 323 | + shipmentHeader.setUserDef1(id.toString()); | |
| 324 | + shipmentHeader.setUserDef2(number); | |
| 325 | + shipmentHeaderService.updateById(shipmentHeader); | |
| 320 | 326 | System.out.println("PURCHASE_RETURN_SAVE:"+"单号"+referCode+"成功！"); |
| 321 | 327 | } |
| 322 | 328 | |
| ... | ... | @@ -327,7 +333,7 @@ public class InvokeHelper { |
| 327 | 333 | purchasePush.setFormid("PUR_MRB"); |
| 328 | 334 | PurchasePushData purchasePushData = new PurchasePushData(); |
| 329 | 335 | purchasePush.setData(purchasePushData); |
| 330 | - purchasePush.getData().setIds(shipmentHeader.getUserDef1()); | |
| 336 | + purchasePush.getData().setIds(shipmentHeader.getReferLineId().toString()); | |
| 331 | 337 | JSONObject jsonObject = (JSONObject) JSONObject.toJSON(purchasePush); |
| 332 | 338 | Invoke(JinDieApiUri.PURCHASE_RETURN_SUBMIT.getApiUri(), jsonObject); |
| 333 | 339 | System.out.println("PURCHASE_RETURN_SUBMIT:"+"单号"+referCode+"成功！"); |
| ... | ... | @@ -340,7 +346,7 @@ public class InvokeHelper { |
| 340 | 346 | purchasePush.setFormid("PUR_MRB"); |
| 341 | 347 | PurchasePushData purchasePushData = new PurchasePushData(); |
| 342 | 348 | purchasePush.setData(purchasePushData); |
| 343 | - purchasePush.getData().setIds(shipmentHeader.getUserDef1()); | |
| 349 | + purchasePush.getData().setIds(shipmentHeader.getReferLineId().toString()); | |
| 344 | 350 | JSONObject jsonObject = (JSONObject) JSONObject.toJSON(purchasePush); |
| 345 | 351 | Invoke(JinDieApiUri.PURCHASE_RETURN_AUDIT.getApiUri(), jsonObject); |
| 346 | 352 | System.out.println("PURCHASE_RETURN_AUDIT:"+"单号"+referCode+"成功！"); |
| ... | ... |
src/main/java/com/huaheng/pc/monitor/job/task/RyTask.java
| ... | ... | @@ -459,7 +459,9 @@ public class RyTask extends BaseController { |
| 459 | 459 | ShipmentHeader shipmentHeader = shipmentHeaderService.getOne(lambdaQueryWrapper); |
| 460 | 460 | if(shipmentHeader != null){ |
| 461 | 461 | String referCode = shipmentHeader.getReferCode(); |
| 462 | - invokeHelper.purchase_return_save(referCode); | |
| 462 | + if(shipmentHeader.getUserDef1()==null&&shipmentHeader.getUserDef2()==null){ | |
| 463 | + invokeHelper.purchase_return_save(referCode); | |
| 464 | + } | |
| 463 | 465 | invokeHelper.purchase_return_submit(referCode); |
| 464 | 466 | invokeHelper.purchase_return_audit(referCode); |
| 465 | 467 | shipmentHeader.setFirstStatus(QuantityConstant.SHIPMENT_HEADER_RETURN); |
| ... | ... |
src/main/java/com/huaheng/pc/shipment/shipmentHeader/domain/ShipmentHeader.java
| ... | ... | @@ -68,6 +68,14 @@ public class ShipmentHeader implements Serializable { |
| 68 | 68 | @ApiModelProperty(value = "erp订单内部号") |
| 69 | 69 | private Integer referId; |
| 70 | 70 | |
| 71 | + | |
| 72 | + /** | |
| 73 | + * erp订单id | |
| 74 | + */ | |
| 75 | + @TableField(value = "referLineId") | |
| 76 | + @ApiModelProperty(value = "erp订单id") | |
| 77 | + private Integer referLineId; | |
| 78 | + | |
| 71 | 79 | /** |
| 72 | 80 | * 订单平台 |
| 73 | 81 | */ |
| ... | ... |