diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/constant/OverallConstant.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/constant/OverallConstant.java index b9e990b8..d32cf3ee 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/constant/OverallConstant.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/constant/OverallConstant.java @@ -29,26 +29,21 @@ public class OverallConstant { //存货分类 prodOverPublic.put("bdinvSaveCode", "8000370025");//存货分类新增 - prodOverPublic.put("bdinvSave", "/u8cloud/api/uapbd/bdinvcl/save");//存货分类新增 prodOverPublic.put("bdinvUpdateCode", "8000370026");//存货分类修改 - prodOverPublic.put("bdinvUpdate", "/u8cloud/api/uapbd/bdinvcl/update");//存货分类修改 prodOverPublic.put("bdinvDeleteCode", "8000370027");//存货分类删除 - prodOverPublic.put("bdinvDelete", "/u8cloud/api/uapbd/bdinvcl/delete");//存货分类删除 //存货基本档案 prodOverPublic.put("bdinvclSaveCode", "8000370002");//存货基本档案新增 - prodOverPublic.put("bdinvclSave", "/u8cloud/api/uapbd/bdinvcl/save");//存货基本档案新增 prodOverPublic.put("bdinvclUpdateCode", "8000370046");//存货基本档案修改 - prodOverPublic.put("bdinvclUpdate", "/u8cloud/api/uapbd/invbasdoc/update");//存货基本档案修改 prodOverPublic.put("bdinvclSealCode", "8000370058");//存货基本档案封存 - prodOverPublic.put("bdinvclSeal", "/u8cloud/api/uapbd/invbasdoc/seal");//存货基本档案封存 prodOverPublic.put("bdinvclUnsealCode", "8000370059");//存货基本档案取消封存 - prodOverPublic.put("bdinvclUnseal", "/u8cloud/api/uapbd/invbasdoc/unseal");//存货基本档案取消封存 prodOverPublic.put("bdinvclAllotCode", "8000370003");//存货基本档案自动分配 - prodOverPublic.put("bdinvclAllot", "/u8cloud/api/uapbd/invbasdoc/assign");//存货基本档案自动分配 //成套件 prodOverPublic.put("setpartInsertCode", "8000370063");//成套件新增 prodOverPublic.put("setpartDeleteCode", "8000370064");//成套件删除 prodOverPublic.put("setpartQueryCode", "8000370065");//成套件查询 + //组装拆卸 + prodOverPublic.put("special4lSaveCode", "8000370066");//成套件查询 + //调拨 prodOverPublic.put("approveqzCode", "8000370009");//调拨订单保存即审批 diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/adjust/AdjustInZZPluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/adjust/AdjustInZZPluginInitializer.java index 55b69126..2ba1315c 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/adjust/AdjustInZZPluginInitializer.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/adjust/AdjustInZZPluginInitializer.java @@ -229,7 +229,7 @@ public class AdjustInZZPluginInitializer extends PluginBaseEntity { } /** - * 过滤成功日志 + * 过滤成功日志,收发类别非0106 组装入库 的过滤 * * @return */ @@ -238,11 +238,11 @@ public class AdjustInZZPluginInitializer extends PluginBaseEntity { for (StockinOrderSearchResponse.StockinOrder stockinOrder : stockinOrders) { StockinOrderSearchResponse.StockinOrder.StockinH header = stockinOrder.getHeader(); - //cdispatcherid--收发类别, + //cdispatcherid--收发类别,U8_RECEIPT_TYPE 0106 组装入库 List ofsAdjustOrders = queryOfsAdjustOrders(header.getRefOrderCode()); - - - + if(!"0106".equals(ofsAdjustOrders.get(0).getHeader().getU8ReceiptType())){ + continue; + } String rootAppPk = header.getCode(); boolean isExis = true; IntegrationTaskLivingDetailsEntity integrationTaskLivingDetailsEntity = new IntegrationTaskLivingDetailsEntity(); @@ -261,12 +261,15 @@ public class AdjustInZZPluginInitializer extends PluginBaseEntity { } /** - * 推送U8C其它入库单 + * 推送U8C组装单 + * 根据货品编码查询成套键，找到组件，套件。 + * 组件数量=子母比*数量 * * @param filterStockinOrders */ public void implement(List filterStockinOrders) { for (StockinOrderSearchResponse.StockinOrder stockinOrder : filterStockinOrders) { + System.out.println(stockinOrder); String mapStr = ""; String format = ""; String response = ""; @@ -285,7 +288,7 @@ public class AdjustInZZPluginInitializer extends PluginBaseEntity { // mapStr = "{\"GeneralBillVO_4A\":[" + dataJson + "]}"; //推送 -// ZTResult ztResult = pushU8CByApiCode.pushByCode(OverallConstant.getOverAllValue("otherinqzCode"), mapStr); +// ZTResult ztResult = pushU8CByApiCode.pushByCode(OverallConstant.getOverAllValue("special4lSaveCode"), mapStr); // // //两层判断,一层中台转发,一层u8c返回 // if ("false".equals(ztResult.getFlag())) { diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/u8cdto/SpecialbillVO.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/u8cdto/SpecialbillVO.java index 0771acbb..3da2015a 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/u8cdto/SpecialbillVO.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/u8cdto/SpecialbillVO.java @@ -13,29 +13,132 @@ public class SpecialbillVO { private List childrenvo; @Data - public static class Parentvo{ - private String dbilldate; - private String cauditorid; - private String cbilltypecode; - private String coperatorid; - private String cspecialhid; - /**库管员*/ - private String cwhsmanagerid; - private String pk_corp; - private String vbillcode; - private String vnote; - + public static class Parentvo { + private String dbilldate;//单据日期 + private String cauditorid;//审核人 + private String cbilltypecode = "4L";//单据类型,默认4L + private String cwhsmanagerid;//库管员 + private String cindispatcherid;//收发类别-收(审批，3.6及上版本支持) + private String cinwarehouseid;//入库仓库(审批，3.6及上版本支持) + private String coperatorid;//制单人 + private String coutbsor;//业务员 + private String coutdeptid;//部门 + private String coutdispatcherid;//收发类别-发(审批，3.6及上版本支持) + private String coutwarehouseid;//出库仓库(审批，3.6及上版本支持) + private String cspecialhid;//表头主键(修改、审批必传) + private String nfixdisassemblymny;//组装费 + private String pk_corp;//公司 + private String vbillcode;//单据号 + private String vnote;//备注 + private String pk_defdoc1;//自定义项主键1 + private String pk_defdoc10;//自定义项主键10 + private String pk_defdoc11;//自定义项主键11 + private String pk_defdoc12;//自定义项主键12 + private String pk_defdoc13;//自定义项主键13 + private String pk_defdoc14;//自定义项主键14 + private String pk_defdoc15;//自定义项主键15 + private String pk_defdoc16;//自定义项主键16 + private String pk_defdoc17;//自定义项主键17 + private String pk_defdoc18;//自定义项主键18 + private String pk_defdoc19;//自定义项主键19 + private String pk_defdoc2;//自定义项主键2 + private String pk_defdoc20;//自定义项主键20 + private String pk_defdoc3;//自定义项主键3 + private String pk_defdoc4;//自定义项主键4 + private String pk_defdoc5;//自定义项主键5 + private String pk_defdoc6;//自定义项主键6 + private String pk_defdoc7;//自定义项主键7 + private String pk_defdoc8;//自定义项主键8 + private String pk_defdoc9;//自定义项主键9 + private String vuserdef1;//自定义项1 + private String vuserdef10;//自定义项10 + private String vuserdef11;//自定义项11 + private String vuserdef12;//自定义项12 + private String vuserdef13;//自定义项13 + private String vuserdef14;//自定义项14 + private String vuserdef15;//自定义项15 + private String vuserdef16;//自定义项16 + private String vuserdef17;//自定义项17 + private String vuserdef18;//自定义项18 + private String vuserdef19;//自定义项19 + private String vuserdef2;//自定义项2 + private String vuserdef20;//自定义项20 + private String vuserdef3;//自定义项3 + private String vuserdef4;//自定义项4 + private String vuserdef5;//自定义项5 + private String vuserdef6;//自定义项6 + private String vuserdef7;//自定义项7 + private String vuserdef8;//自定义项8 + private String vuserdef9;//自定义项9 } - @Data - public static class Childrenvo{ - private String cinventoryid; - private String crowno; - private String cspecialbid; - private String cvendorid; - private String cwarehouseid; - private String dshldtransnum; - private String fbillrowflag; - private String vnote; + public static class Childrenvo { + private String castunitid;//辅计量单位 + private String cinventoryid;//存货 + private String crowno;//行号 + private String cspecialbid;//表体主键(修改、审核必传) + private String cvendorid;//供应商 + private String cwarehouseid;//仓库 + private String dshldtransnum;//数量 + private String dvalidate;//失效日期 + private String fbillrowflag;//类型（0：成套件，1：配件） + private String hsl;//换算率 + private String nprice;//单价 + private String nshldtransastnum;//辅数量 + private String nshldtransgrsnum;//毛重 + private String vbatchcode;//批次号 + private String vnote;//备注 + private String pk_defdoc1;//自定义项主键1 + private String pk_defdoc10;//自定义项主键10 + private String pk_defdoc11;//自定义项主键11 + private String pk_defdoc12;//自定义项主键12 + private String pk_defdoc13;//自定义项主键13 + private String pk_defdoc14;//自定义项主键14 + private String pk_defdoc15;//自定义项主键15 + private String pk_defdoc16;//自定义项主键16 + private String pk_defdoc17;//自定义项主键17 + private String pk_defdoc18;//自定义项主键18 + private String pk_defdoc19;//自定义项主键19 + private String pk_defdoc2;//自定义项主键2 + private String pk_defdoc20;//自定义项主键20 + private String pk_defdoc3;//自定义项主键3 + private String pk_defdoc4;//自定义项主键4 + private String pk_defdoc5;//自定义项主键5 + private String pk_defdoc6;//自定义项主键6 + private String pk_defdoc7;//自定义项主键7 + private String pk_defdoc8;//自定义项主键8 + private String pk_defdoc9;//自定义项主键9 + private String pk_measdoc;//主计量单位 + private String vfree1;//自由项1 + private String vfree10;//自由项10 + private String vfree2;//自由项2 + private String vfree3;//自由项3 + private String vfree4;//自由项4 + private String vfree5;//自由项5 + private String vfree6;//自由项6 + private String vfree7;//自由项7 + private String vfree8;//自由项8 + private String vfree9;//自由项9 + private String vuserdef1;//自定义项1 + private String vuserdef10;//自定义项10 + private String vuserdef11;//自定义项11 + private String vuserdef12;//自定义项12 + private String vuserdef13;//自定义项13 + private String vuserdef14;//自定义项14 + private String vuserdef15;//自定义项15 + private String vuserdef16;//自定义项16 + private String vuserdef17;//自定义项17 + private String vuserdef18;//自定义项18 + private String vuserdef19;//自定义项19 + private String vuserdef2;//自定义项2 + private String vuserdef20;//自定义项20 + private String vuserdef3;//自定义项3 + private String vuserdef4;//自定义项4 + private String vuserdef5;//自定义项5 + private String vuserdef6;//自定义项6 + private String vuserdef7;//自定义项7 + private String vuserdef8;//自定义项8 + private String vuserdef9;//自定义项9 + } }