|
|
@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
+import org.yaml.snakeyaml.util.UriEncoder;
|
|
|
import thyyxxk.webserver.config.envionment.SystemConfig;
|
|
|
import thyyxxk.webserver.constants.sidicts.SiFunction;
|
|
|
import thyyxxk.webserver.entity.ResultVo;
|
|
|
@@ -94,6 +95,10 @@ public class SiInventoryService {
|
|
|
log.info("selinfo=" + JSONObject.toJSONString(selinfo));
|
|
|
selinfo.put("fixmedins_hilist_id", sysCfg.getInstitutionId());
|
|
|
selinfo.put("fixmedins_hilist_name", sysCfg.getInstitutionName());
|
|
|
+ selinfo.put("prsc_dr_name", UriEncoder.decode(String.valueOf(selinfo.get("prsc_dr_name"))));
|
|
|
+ selinfo.put("phar_name", UriEncoder.decode(String.valueOf(selinfo.get("phar_name"))));
|
|
|
+ selinfo.put("psn_name", UriEncoder.decode(String.valueOf(selinfo.get("psn_name"))));
|
|
|
+ selinfo.put("sel_retn_opter_name", UriEncoder.decode(String.valueOf(selinfo.get("sel_retn_opter_name"))));
|
|
|
String ref = JSONObject.toJSONString(selinfo);
|
|
|
JSONObject input = exec.makeTradeHeader(SiFunction.UPLOAD_COMMODITY_SALES);
|
|
|
input.getJSONObject("input").put("selinfo", JSONObject.parseObject(ref));
|
|
|
@@ -106,6 +111,7 @@ public class SiInventoryService {
|
|
|
log.info("selinfo=" + JSONObject.toJSONString(selinfo));
|
|
|
selinfo.put("fixmedins_hilist_id", sysCfg.getInstitutionId());
|
|
|
selinfo.put("fixmedins_hilist_name", sysCfg.getInstitutionName());
|
|
|
+ selinfo.put("sel_retn_opter_name", UriEncoder.decode(String.valueOf(selinfo.get("sel_retn_opter_name"))));
|
|
|
String ref = JSONObject.toJSONString(selinfo);
|
|
|
JSONObject input = exec.makeTradeHeader(SiFunction.UPLOAD_COMMODITY_SALES_RETURN);
|
|
|
input.getJSONObject("input").put("selinfo", JSONObject.parseObject(ref));
|
yeguodong