|
|
@@ -2936,7 +2936,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
|
|
|
jsonObject1.put("CPTCODE","02");
|
|
|
}
|
|
|
jsonObject1.put("CCUSCODE",order.get("cCusCode"));//客户编码
|
|
|
-// jsonObject1.put("CDEPCODE",order.get("cDepCode"));//部门编码
|
|
|
+ jsonObject1.put("CDEPCODE","");//部门编码
|
|
|
jsonObject1.put("SALETPYECODE",order.get("cSTCode"));//销售类型编码
|
|
|
jsonObject1.put("IEXCHRATE",order.get("iExchRate"));//汇率
|
|
|
jsonObject1.put("CEXCH_NAME",order.get("cexch_name"));//币种名称
|
|
|
@@ -3012,7 +3012,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
|
|
|
text(jsonArrays1,"测试合并推送面辅料销售发票");
|
|
|
// System.out.println("102销售发票\t"+jsonArrays1);
|
|
|
JSONArray resturnJsonArrays = InterfaceConnUtils.doPost(jsonArrays1,"saleinvoice_import");//销售发票单
|
|
|
- Map<String,String> codeMaps2 = result(resturnJsonArrays);
|
|
|
+ Map<String,String> codeMaps2 = result2(resturnJsonArrays);
|
|
|
for (String code1 : codeMaps.keySet()){
|
|
|
List<SyPackingListFabric> listFabricList=codeMaps.get(code1);
|
|
|
if(!codeMaps2.containsKey(code1)){//循环中没有就退出
|
|
|
@@ -3077,6 +3077,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
|
|
|
jsonObject1.put("CHANDLER","进出口平台管理员");//审核人
|
|
|
jsonObject1.put("CACCID",account);//账套号
|
|
|
jsonObject1.put("CTYPE","专用");//发-票类型
|
|
|
+ jsonObject1.put("CDEPCODE","");//部门编码
|
|
|
|
|
|
jsonObject1.put("CGLTYPE","入库单");//上游单据
|
|
|
jsonObject1.put("DDATE",syPackingListFabric.getTheFinalShippingDate().substring(0,10));//装运期限
|
|
|
@@ -3287,6 +3288,20 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
|
|
|
return codeMaps;//账套号-序号-生成的单号
|
|
|
}
|
|
|
|
|
|
+ public Map<String,String> result2(JSONArray jsonArray){
|
|
|
+ Map<String,String> codeMaps=new HashMap<>();
|
|
|
+ for (int i=0;i<jsonArray.size();i++){
|
|
|
+ JSONObject jsonObject=jsonArray.getJSONObject(i);
|
|
|
+ if(jsonObject.get("Result").equals("F")){//获取发货单是否成功添加
|
|
|
+ //throw new JeecgBootException("账套"+account+"接口"+tableName+",原因"+ jsonObject.get("Description"));
|
|
|
+ codeMaps.put(jsonObject.get("ReceiptNo").toString(),"销售发票接口推送失败原因："+jsonObject.get("Description").toString());//key:传入的单号,value:失败的信息
|
|
|
+ }else{
|
|
|
+ codeMaps.put(jsonObject.get("ReceiptNo").toString(),"102销售发票单号"+jsonObject.get("U8ReceiptNo").toString());//key:传入的单号,value:生成的单号
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return codeMaps;//账套号-序号-生成的单号
|
|
|
+ }
|
|
|
+
|
|
|
@Override
|
|
|
public List<SyPackingListFabric> queryByList(String id) {
|
|
|
return syPackingListFabricMapper.queryByList(id);
|
huxy