diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/adjust/AdjustInPluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/adjust/AdjustInPluginInitializer.java index c4834785..94ee9a12 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/adjust/AdjustInPluginInitializer.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/adjust/AdjustInPluginInitializer.java @@ -14,9 +14,13 @@ import com.hzya.frame.plugin.lets.entity.BdRdclEntity; import com.hzya.frame.plugin.lets.ofsvo.QueryOfsStockinOrderRequestVO; import com.hzya.frame.plugin.lets.u8cdto.BillVO; import com.hzya.frame.plugin.lets.u8cdto.GeneralBillVO_4ADto; +import com.hzya.frame.plugin.lets.u8cdto.GeneralBillVO_4IDto; import com.hzya.frame.plugin.lets.u8cdto.ReusltStrDto; import com.hzya.frame.plugin.lets.util.PushDataByU8cUtil; import com.hzya.frame.plugin.lets.util.SaveOrUpdateBusinessLogUtil; +import com.hzya.frame.plugin.lets.util.pushData.Attribute; +import com.hzya.frame.plugin.lets.util.pushData.PushU8CByApiCode; +import com.hzya.frame.plugin.lets.util.pushData.ZTResult; import com.hzya.frame.sysnew.integtationTaskLivingDetails.dao.IIntegrationTaskLivingDetailsDao; import com.hzya.frame.sysnew.integtationTaskLivingDetails.entity.IntegrationTaskLivingDetailsEntity; import com.hzya.frame.ttxofs.dto.InterfaceParamDto; @@ -73,6 +77,8 @@ public class AdjustInPluginInitializer extends PluginBaseEntity { @Autowired private PushDataByU8cUtil pushDataByU8cUtil; @Autowired + private PushU8CByApiCode pushU8CByApiCode; + @Autowired private SaveOrUpdateBusinessLogUtil saveOrUpdateBusinessLogUtil; @Autowired @@ -174,12 +180,12 @@ public class AdjustInPluginInitializer extends PluginBaseEntity { System.out.println(stockinOrders); if (stockinOrders.size() == 0) { - Assert.state(false, "丽知：OFS调整入库--->U8C其它入库根据单据号[入库完成]：{}，未查询到调整出库单",stockinNo); + Assert.state(false, "丽知：OFS调整入库--->U8C其它入库根据单据号[入库完成]：{}，未查询到调整出库单", stockinNo); } //过滤日志 List filterStockinOrders = filterData(stockinOrders); if (filterStockinOrders.size() == 0) { - Assert.state(false, "丽知：OFS调整入库--->U8C其它入库根据单据号[入库完成]：{}，该调整出库单已被推送成功，请勿重新推送",stockinNo); + Assert.state(false, "丽知：OFS调整入库--->U8C其它入库根据单据号[入库完成]：{}，该调整出库单已被推送成功，请勿重新推送", stockinNo); } //推送 @@ -211,12 +217,12 @@ public class AdjustInPluginInitializer extends PluginBaseEntity { System.out.println(stockinOrders); if (stockinOrders.size() == 0) { - Assert.state(false, "丽知：OFS调整入库--->U8C其它入库根据日期期间[开始时间]-[结束时间]：{}-{}，未查询到调整入库单[入库完成]",startTime,endTime); + Assert.state(false, "丽知：OFS调整入库--->U8C其它入库根据日期期间[开始时间]-[结束时间]：{}-{}，未查询到调整入库单[入库完成]", startTime, endTime); } //过滤日志 List filterStockinOrders = filterData(stockinOrders); if (filterStockinOrders.size() == 0) { - Assert.state(false, "丽知：OFS调整入库--->U8C其它入库根据日期期间[开始时间]-[结束时间]：{}-{}，该调期间整入库单[入库完成]已被推送成功，请勿重新推送",startTime,endTime); + Assert.state(false, "丽知：OFS调整入库--->U8C其它入库根据日期期间[开始时间]-[结束时间]：{}-{}，该调期间整入库单[入库完成]已被推送成功，请勿重新推送", startTime, endTime); } //推送 @@ -256,22 +262,23 @@ public class AdjustInPluginInitializer extends PluginBaseEntity { /** * 推送U8C其它入库单 + * * @param filterStockinOrders */ - public void implement(List filterStockinOrders){ + public void implement(List filterStockinOrders) { for (StockinOrderSearchResponse.StockinOrder stockinOrder : filterStockinOrders) { String mapStr = ""; - String format=""; - String response=""; - String ofsCode=""; - try{ + String format = ""; + String response = ""; + String ofsCode = ""; + try { //主表 StockinOrderSearchResponse.StockinOrder.StockinH ofsHeader = stockinOrder.getHeader(); GeneralBillVO_4ADto generalBillVO_4A = new GeneralBillVO_4ADto(); GeneralBillVO_4ADto.Parentvo parentvo = new GeneralBillVO_4ADto.Parentvo(); //ofs订单号，自定义项19 - ofsCode=ofsHeader.getCode(); + ofsCode = ofsHeader.getCode(); parentvo.setVuserdef19(ofsCode); //pk_corp--公司 @@ -286,13 +293,13 @@ public class AdjustInPluginInitializer extends PluginBaseEntity { //dbilldate--单据日期--oms入库时间 // Date created = ofsHeader.getCreated(); // format = DateUtil.format(created, "yyyy-MM-dd HH:mm:ss"); - format = ofsHeader.getCreated(); - parentvo.setDbilldate(StringUtils.substring(format,0,10)); + format = ofsHeader.getCreated(); + parentvo.setDbilldate(StringUtils.substring(format, 0, 10)); //coperatorid--制单人 String createdBy = ofsHeader.getCreatedBy(); parentvo.setCoperatorid("tbadmin"); //审核时间dauditdate - parentvo.setDauditdate(StringUtils.substring(format,0,10)); + parentvo.setDauditdate(StringUtils.substring(format, 0, 10)); //cdispatcherid--收发类别，ofs过来的写死，20240813（妮姐+万万），就是调整出库，调整入库 BdRdclEntity bdRdclEntity = new BdRdclEntity(); @@ -300,14 +307,14 @@ public class AdjustInPluginInitializer extends PluginBaseEntity { bdRdclEntity.setDr(0); bdRdclEntity.setDataSourceCode(ProfilesActiveConstant.LETS_DATE_SOURCE); List BdRdclEntityList = iBdRdclDao.query(bdRdclEntity); - if(BdRdclEntityList.size()==0){ - Assert.state(false,"查询U8C收发类型：调整入库失败。未查询到U8C收发类型。"); + if (BdRdclEntityList.size() == 0) { + Assert.state(false, "查询U8C收发类型：调整入库失败。未查询到U8C收发类型。"); } String RdclCode = BdRdclEntityList.get(0).getRdcode();//收发类别编码 parentvo.setCdispatcherid(RdclCode); //子表 - List childrenvo=new ArrayList<>(); + List childrenvo = new ArrayList<>(); for (StockinOrderSearchResponse.StockinOrder.StockinB ofsDetail : stockinOrder.getDetails()) { System.out.println(ofsDetail); GeneralBillVO_4ADto.Childrenvo children = new GeneralBillVO_4ADto.Childrenvo(); @@ -332,19 +339,25 @@ public class AdjustInPluginInitializer extends PluginBaseEntity { mapStr = "{\"GeneralBillVO_4A\":[" + dataJson + "]}"; //推送 - response = pushDataByU8cUtil.pushU8CByCode(OverallConstant.getOverAllValue("otherinqz"), mapStr); - System.out.println(response); +// response = pushDataByU8cUtil.pushU8CByCode(OverallConstant.getOverAllValue("otherinqz"), mapStr); + ZTResult ztResult = pushU8CByApiCode.pushByCode(OverallConstant.getOverAllValue("otherinqzCode"), mapStr); + + //两层判断,一层中台转发,一层u8c返回 + if ("false".equals(ztResult.getFlag())) { + //转发失败 + Assert.state(false, "丽知：OFS调整入库--->U8C其它入库.中台转发失败,失败原因:{}", ztResult.getMsg()); + } + Attribute attribute = ztResult.getAttribute(); + System.out.println(attribute); + boolean isSuccess = false; - String vbillcode=""; - if (response != null && !"".equals(response)) { - ReusltStrDto reusltStrDto = JSON.parseObject(response, ReusltStrDto.class); - if ("success".equals(reusltStrDto.getStatus())) { - isSuccess = true; - String data = reusltStrDto.getData(); - GeneralBillVO_4ADto resGeneralBillVO = resultDataHandle(data); - System.out.println(resGeneralBillVO); - vbillcode = resGeneralBillVO.getParentvo().getVbillcode(); - } + String vbillcode = ""; + if ("success".equals(attribute.getStatus())) { + isSuccess = true; + String data = attribute.getData(); + GeneralBillVO_4ADto resGeneralBillVO = resultDataHandle(data); + System.out.println(resGeneralBillVO); + vbillcode = resGeneralBillVO.getParentvo().getVbillcode(); } if (!isSuccess) { Assert.state(false, "推送U8C--> 丽知：OFS调整入库--->U8C其它入库 失败 接口返回结果：{} 接口入参:{}", response, mapStr); @@ -360,16 +373,17 @@ public class AdjustInPluginInitializer extends PluginBaseEntity { integrationTaskLivingDetailsEntity.setRootAppPk(ofsCode); integrationTaskLivingDetailsEntity.setRootAppBill(ofsCode); integrationTaskLivingDetailsEntity.setRootAppBill(vbillcode); + integrationTaskLivingDetailsEntity.setDef1(vbillcode); integrationTaskLivingDetailsEntity.setPluginId(getPluginId()); saveOrUpdateBusinessLogUtil.saveOrUpdate(integrationTaskLivingDetailsEntity); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); logger.error("推送U8C，丽知：OFS调整入库--->U8C其它入库失败，失败原因：" + e); ReusltStrDto reusltStrDto = JSON.parseObject(response, ReusltStrDto.class); - String ErrMessage ="推送U8C，丽知：OFS调整入库--->U8C其它入库失败，失败原因："+ reusltStrDto.getErrormsg(); + String ErrMessage = "推送U8C，丽知：OFS调整入库--->U8C其它入库失败，失败原因：" + reusltStrDto.getErrormsg(); //失败 IntegrationTaskLivingDetailsEntity integrationTaskLivingDetailsEntity = new IntegrationTaskLivingDetailsEntity(); integrationTaskLivingDetailsEntity.setNewState(ProfilesActiveConstant.LOG_STATUS_N); diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/adjust/AdjustOutPluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/adjust/AdjustOutPluginInitializer.java index b21a93a2..1265c611 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/adjust/AdjustOutPluginInitializer.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/adjust/AdjustOutPluginInitializer.java @@ -18,6 +18,9 @@ import com.hzya.frame.plugin.lets.u8cdto.GeneralBillVO_4IDto; import com.hzya.frame.plugin.lets.u8cdto.ReusltStrDto; import com.hzya.frame.plugin.lets.util.PushDataByU8cUtil; import com.hzya.frame.plugin.lets.util.SaveOrUpdateBusinessLogUtil; +import com.hzya.frame.plugin.lets.util.pushData.Attribute; +import com.hzya.frame.plugin.lets.util.pushData.PushU8CByApiCode; +import com.hzya.frame.plugin.lets.util.pushData.ZTResult; import com.hzya.frame.sysnew.integtationTaskLivingDetails.dao.IIntegrationTaskLivingDetailsDao; import com.hzya.frame.sysnew.integtationTaskLivingDetails.entity.IntegrationTaskLivingDetailsEntity; import com.hzya.frame.ttxofs.dto.InterfaceParamDto; @@ -81,6 +84,8 @@ public class AdjustOutPluginInitializer extends PluginBaseEntity { @Autowired private PushDataByU8cUtil pushDataByU8cUtil; @Autowired + private PushU8CByApiCode pushU8CByApiCode; + @Autowired private SaveOrUpdateBusinessLogUtil saveOrUpdateBusinessLogUtil; @Autowired @@ -176,12 +181,12 @@ public class AdjustOutPluginInitializer extends PluginBaseEntity { queryOfsStockoutOrderRequestVO.setPageSize(500L); List stockoutOrders = queryOfsStockoutOrder(queryOfsStockoutOrderRequestVO); if (stockoutOrders == null || stockoutOrders.size() == 0) { - Assert.state(false, "丽知：OFS调整出库--->U8C其它出库根据单据号[出库完成]：{}，未查询到调整出库单",stockoutNo); + Assert.state(false, "丽知：OFS调整出库--->U8C其它出库根据单据号[出库完成]：{}，未查询到调整出库单", stockoutNo); } //过滤日志 List filterStockoutOrders = filterData(stockoutOrders); if (filterStockoutOrders == null || filterStockoutOrders.size() == 0) { - Assert.state(false, "丽知：OFS调整出库--->U8C其它出库根据单据号[出库完成]：{}，该调整出库单已被推送成功，请勿重新推送",stockoutNo); + Assert.state(false, "丽知：OFS调整出库--->U8C其它出库根据单据号[出库完成]：{}，该调整出库单已被推送成功，请勿重新推送", stockoutNo); } //推送 implement(filterStockoutOrders); @@ -211,13 +216,13 @@ public class AdjustOutPluginInitializer extends PluginBaseEntity { queryOfsStockoutOrderRequestVO.setPageSize(500L); List stockoutOrders = queryOfsStockoutOrder(queryOfsStockoutOrderRequestVO); if (stockoutOrders == null || stockoutOrders.size() == 0) { - Assert.state(false, "丽知：OFS调整出库--->U8C其它出库根据日期期间[开始时间]-[结束时间]：{}-{}，未查询到调整出库单[出库完成]",startTime,endTime); + Assert.state(false, "丽知：OFS调整出库--->U8C其它出库根据日期期间[开始时间]-[结束时间]：{}-{}，未查询到调整出库单[出库完成]", startTime, endTime); } //过滤日志 List filterStockoutOrders = filterData(stockoutOrders); if (filterStockoutOrders == null || filterStockoutOrders.size() == 0) { - Assert.state(false, "丽知：OFS调整出库--->U8C其它出库根据日期期间[开始时间]-[结束时间]：{}-{}，该调期间整出库单[出库完成]已被推送成功，请勿重新推送",startTime,endTime); + Assert.state(false, "丽知：OFS调整出库--->U8C其它出库根据日期期间[开始时间]-[结束时间]：{}-{}，该调期间整出库单[出库完成]已被推送成功，请勿重新推送", startTime, endTime); } //推送 implement(filterStockoutOrders); @@ -232,8 +237,8 @@ public class AdjustOutPluginInitializer extends PluginBaseEntity { /** * 过滤成功日志 */ - public List filterData(List stockoutOrders){ - List filterStockoutOrders=new ArrayList<>(); + public List filterData(List stockoutOrders) { + List filterStockoutOrders = new ArrayList<>(); for (StockoutOrderSearchResponse.StockoutOrder stockoutOrder : stockoutOrders) { StockoutOrderSearchResponse.StockoutOrder.StockoutH header = stockoutOrder.getHeader(); String rootAppPk = header.getCode(); @@ -256,14 +261,15 @@ public class AdjustOutPluginInitializer extends PluginBaseEntity { /** * 丽知：OFS调整出库--->U8C其它出库 + * * @param filterStockoutOrders */ - public void implement(List filterStockoutOrders){ + public void implement(List filterStockoutOrders) { for (StockoutOrderSearchResponse.StockoutOrder stockoutOrder : filterStockoutOrders) { String mapStr = ""; - String format=""; - String response=""; - String ofsCode=""; + String format = ""; + String response = ""; + String ofsCode = ""; try { GeneralBillVO_4IDto generalBillVO_4I = new GeneralBillVO_4IDto(); @@ -274,7 +280,7 @@ public class AdjustOutPluginInitializer extends PluginBaseEntity { //ofs订单号，自定义项19 - ofsCode=ofsHeader.getCode(); + ofsCode = ofsHeader.getCode(); parentvo.setVuserdef19(ofsCode); //pk_corp--公司 @@ -291,11 +297,11 @@ public class AdjustOutPluginInitializer extends PluginBaseEntity { // Date created = ofsHeader.getCreated(); // format = DateUtil.format(created, "yyyy-MM-dd HH:mm:ss"); format = created1; - parentvo.setDbilldate(StringUtils.substring(format,0,10)); + parentvo.setDbilldate(StringUtils.substring(format, 0, 10)); //coperatorid--制单人 parentvo.setCoperatorid("tbadmin"); //审核时间dauditdate - parentvo.setDauditdate(StringUtils.substring(format,0,10)); + parentvo.setDauditdate(StringUtils.substring(format, 0, 10)); //cdispatcherid--收发类别，ofs过来的写死，20240813（妮姐+万万），就是调整出库，调整入库 BdRdclEntity bdRdclEntity = new BdRdclEntity(); @@ -303,8 +309,8 @@ public class AdjustOutPluginInitializer extends PluginBaseEntity { bdRdclEntity.setDr(0); bdRdclEntity.setDataSourceCode(ProfilesActiveConstant.LETS_DATE_SOURCE); List BdRdclEntityList = iBdRdclDao.query(bdRdclEntity); - if(BdRdclEntityList.size()==0){ - Assert.state(false,"查询U8C收发类型：调整出库失败。未查询到U8C收发类型。"); + if (BdRdclEntityList.size() == 0) { + Assert.state(false, "查询U8C收发类型：调整出库失败。未查询到U8C收发类型。"); } String RdclCode = BdRdclEntityList.get(0).getRdcode();//收发类别编码 parentvo.setCdispatcherid(RdclCode); @@ -313,7 +319,7 @@ public class AdjustOutPluginInitializer extends PluginBaseEntity { // parentvo.setIsautopick("Y"); //子表 - List childrenvo=new ArrayList<>(); + List childrenvo = new ArrayList<>(); for (StockoutOrderSearchResponse.StockoutOrder.StockoutB ofsDetail : stockoutOrder.getDetails()) { System.out.println(ofsDetail); GeneralBillVO_4IDto.Childrenvo children = new GeneralBillVO_4IDto.Childrenvo(); @@ -338,22 +344,28 @@ public class AdjustOutPluginInitializer extends PluginBaseEntity { generalBillVO_4I.setChildrenvo(childrenvo); String dataJson = JSONUtil.toJsonStr(generalBillVO_4I); mapStr = "{\"GeneralBillVO_4I\":[" + dataJson + "]}"; - response = pushDataByU8cUtil.pushU8CByCode(OverallConstant.getOverAllValue("otheroutqz"), mapStr); - System.out.println(response); +// response = pushDataByU8cUtil.pushU8CByCode(OverallConstant.getOverAllValue("otheroutqz"), mapStr); + ZTResult ztResult = pushU8CByApiCode.pushByCode(OverallConstant.getOverAllValue("otheroutqzCode"), mapStr); + + //两层判断,一层中台转发,一层u8c返回 + if ("false".equals(ztResult.getFlag())) { + //转发失败 + Assert.state(false, "丽知：OFS调整出库--->U8C其它出库.中台转发失败,失败原因:{}", ztResult.getMsg()); + } + Attribute attribute = ztResult.getAttribute(); + System.out.println(attribute); + boolean isSuccess = false; - String vbillcode=""; - if (response != null && !"".equals(response)) { - ReusltStrDto reusltStrDto = JSON.parseObject(response, ReusltStrDto.class); - if ("success".equals(reusltStrDto.getStatus())) { - isSuccess = true; - String data = reusltStrDto.getData(); - GeneralBillVO_4IDto resGeneralBillVO = resultDataHandle(data); - System.out.println(resGeneralBillVO); - vbillcode = resGeneralBillVO.getParentvo().getVbillcode(); - } + String vbillcode = ""; + if ("success".equals(attribute.getStatus())) { + isSuccess = true; + String data = attribute.getData(); + GeneralBillVO_4IDto resGeneralBillVO = resultDataHandle(data); + System.out.println(resGeneralBillVO); + vbillcode = resGeneralBillVO.getParentvo().getVbillcode(); } if (!isSuccess) { - Assert.state(false, "推送U8C--> 丽知：OFS调整入库--->U8C其它入库 失败 接口返回结果：{} 接口入参:{}", response, mapStr); + Assert.state(false, "推送U8C--> 丽知：OFS调整出库--->U8C其它出库 失败 接口返回结果：{} 接口入参:{}", response, mapStr); } //成功 IntegrationTaskLivingDetailsEntity integrationTaskLivingDetailsEntity = new IntegrationTaskLivingDetailsEntity(); @@ -363,18 +375,17 @@ public class AdjustOutPluginInitializer extends PluginBaseEntity { integrationTaskLivingDetailsEntity.setNewPushDate(new Date()); integrationTaskLivingDetailsEntity.setBusinessDate(format); integrationTaskLivingDetailsEntity.setRootAppPk(ofsCode); - integrationTaskLivingDetailsEntity.setRootAppBill(ofsCode);//u8c其他出库单号 -// integrationTaskLivingDetailsEntity.setRootAppBill(vbillcode);//u8c其他出库单号 + integrationTaskLivingDetailsEntity.setRootAppBill(ofsCode); + integrationTaskLivingDetailsEntity.setDef1(vbillcode);//u8c其他出库单号 integrationTaskLivingDetailsEntity.setPluginId(getPluginId()); saveOrUpdateBusinessLogUtil.saveOrUpdate(integrationTaskLivingDetailsEntity); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); logger.error("推送U8C，丽知：OFS调整出库--->U8C其它出库失败，失败原因：" + e); ReusltStrDto reusltStrDto = JSON.parseObject(response, ReusltStrDto.class); - String ErrMessage ="推送U8C，丽知：OFS调整入库--->U8C其它入库失败，失败原因："+ reusltStrDto.getErrormsg(); - + String ErrMessage = "推送U8C，丽知：OFS调整出库--->U8C其它出库失败，失败原因：" + reusltStrDto.getErrormsg(); //失败 IntegrationTaskLivingDetailsEntity integrationTaskLivingDetailsEntity = new IntegrationTaskLivingDetailsEntity(); @@ -404,7 +415,7 @@ public class AdjustOutPluginInitializer extends PluginBaseEntity { StockoutOrderSearchResponse stockoutOrderSearchResponse = SaleOutReturnMessageDto2StockoutOrderSearchResponse(saleOutReturnMessageDto); System.out.println(stockoutOrderSearchResponse); - if(stockoutOrderSearchResponse.getData()==null||stockoutOrderSearchResponse.getData().size()==0){ + if (stockoutOrderSearchResponse.getData() == null || stockoutOrderSearchResponse.getData().size() == 0) { return null; } return stockoutOrderSearchResponse.getData(); @@ -412,21 +423,22 @@ public class AdjustOutPluginInitializer extends PluginBaseEntity { /** * 只是命名不一样，为了方便区分，顾转换为stockout + * * @param saleOutReturnMessageDto * @return */ - public StockoutOrderSearchResponse SaleOutReturnMessageDto2StockoutOrderSearchResponse(SaleOutReturnMessageDto saleOutReturnMessageDto){ + public StockoutOrderSearchResponse SaleOutReturnMessageDto2StockoutOrderSearchResponse(SaleOutReturnMessageDto saleOutReturnMessageDto) { StockoutOrderSearchResponse stockoutOrderSearchResponse = new StockoutOrderSearchResponse(); - List data=new ArrayList<>(); - BeanUtils.copyProperties(saleOutReturnMessageDto,stockoutOrderSearchResponse); + List data = new ArrayList<>(); + BeanUtils.copyProperties(saleOutReturnMessageDto, stockoutOrderSearchResponse); for (HeaderDetailsDto saleOutData : saleOutReturnMessageDto.getData()) { HeaderDto saleOutHeader = saleOutData.getHeader(); StockoutOrderSearchResponse.StockoutOrder stockoutOrder = new StockoutOrderSearchResponse.StockoutOrder(); StockoutOrderSearchResponse.StockoutOrder.StockoutH stockoutH = new StockoutOrderSearchResponse.StockoutOrder.StockoutH(); - List stockoutBList=new ArrayList<>(); + List stockoutBList = new ArrayList<>(); for (DetailsDto saleOutDetail : saleOutData.getDetails()) { StockoutOrderSearchResponse.StockoutOrder.StockoutB stockoutB = new StockoutOrderSearchResponse.StockoutOrder.StockoutB(); - BeanUtils.copyProperties(saleOutDetail,stockoutB); + BeanUtils.copyProperties(saleOutDetail, stockoutB); stockoutBList.add(stockoutB); } //创建时间，修改时间，创建人，修改人，赋给表头 @@ -436,7 +448,7 @@ public class AdjustOutPluginInitializer extends PluginBaseEntity { stockoutH.setLastUpdated(stockoutB.getLastUpdated()); stockoutH.setLastUpdatedBy(stockoutB.getLastUpdatedBy()); - BeanUtils.copyProperties(saleOutHeader,stockoutH); + BeanUtils.copyProperties(saleOutHeader, stockoutH); stockoutOrder.setHeader(stockoutH); stockoutOrder.setDetails(stockoutBList); data.add(stockoutOrder);