|
|
@@ -1463,8 +1463,10 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
|
|
|
getcFree(mapItem6,orderDataItem2);
|
|
|
mapItem.put("POAUTOIDCOL","ID");//订单明细ID对应字段名(关联单据类型为采购订单传ID,为采购到货单为Autoid,为委外订单传MODetailsID,为委外到货单为Autoid)
|
|
|
mapItem.put("AUTOID_PO",orderDataItem.get("id"));//明细ID(采购订单行ID/委外订单行ID)
|
|
|
- mapItem.put("ITAXRATE",orderDataItem.get("iPerTaxRate"));//税率
|
|
|
- map.put("ITAXRATE",orderDataItem.get("iPerTaxRate"));//税率
|
|
|
+// mapItem.put("ITAXRATE",orderDataItem.get("iPerTaxRate"));//税率
|
|
|
+// map.put("ITAXRATE",orderDataItem.get("iPerTaxRate"));//税率
|
|
|
+ mapItem.put("ITAXRATE","13");//税率
|
|
|
+ map.put("ITAXRATE","13");//税率
|
|
|
//mapItem.put("IPROCESSCOST",orderDataItem.get("iUnitPrice"));//明细ID(采购订单行ID/委外订单行ID)
|
|
|
map5.put("CGLTYPE","入库单");
|
|
|
mapItem5.put("POAUTOIDCOL","Autoid");//明细ID对应字段名(关联单据类型为采购订单传ID,委外订单传MODetailsID,入库单为Autoid)
|
|
|
@@ -1821,6 +1823,25 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
|
|
|
}
|
|
|
|
|
|
redisUtil.set("pushsno001", pushsno001);//采购委外入库单
|
|
|
+ // 101默认税率为0,102,103默认税率为13
|
|
|
+ for (int i=0; i< mapList.size();i++){
|
|
|
+ JSONObject jsonObject = mapList.getJSONObject(i);
|
|
|
+ String account = jsonObject.getString("CACCID");
|
|
|
+ if(account.equals("102")||account.equals("103")){
|
|
|
+ jsonObject.put("ITAXRATE","13");
|
|
|
+ }else{
|
|
|
+ jsonObject.put("ITAXRATE","0");
|
|
|
+ }
|
|
|
+ JSONArray detailArray = jsonObject.getJSONArray("DETAILList");
|
|
|
+ for (int j=0;j<detailArray.size();j++){
|
|
|
+ JSONObject detailObject = detailArray.getJSONObject(j);
|
|
|
+ if(account.equals("102")||account.equals("103")){
|
|
|
+ detailObject.put("ITAXRATE","13");
|
|
|
+ }else{
|
|
|
+ detailObject.put("ITAXRATE","0");
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
JSONArray resturn1 = InterfaceConnUtils.doPost(mapList,"purchasein_import");//采购入库单
|
|
|
recording=result(main,resturn1,mapt.get("ordertype")+"入库单",((Map) mapList.get(0)).get("CACCID").toString(),"1");//采购入库单
|
|
|
recording(main,recording);
|