diff --git a/WebContent/WEB-INF/etc/jbo/jbo_customer.xml b/WebContent/WEB-INF/etc/jbo/jbo_customer.xml
index ca79d88d5..56ff78d7b 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_customer.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_customer.xml
@@ -1121,6 +1121,7 @@
+
@@ -1411,6 +1412,7 @@
+
diff --git a/calc/com/tenwa/flow/CopyInfoTempToFormal.java b/calc/com/tenwa/flow/CopyInfoTempToFormal.java
index 8530772e2..0c1f2734a 100644
--- a/calc/com/tenwa/flow/CopyInfoTempToFormal.java
+++ b/calc/com/tenwa/flow/CopyInfoTempToFormal.java
@@ -22,25 +22,20 @@ public class CopyInfoTempToFormal extends BaseBussiness{
@Override
public Object run(Transaction Sqlca) throws Exception {
this.initBussinessParam(Sqlca);
- String orgid=this.saveOrgInfo(Sqlca);
MapfromCondtion=new HashMap();
+
fromCondtion.put("flowunid",this.getAttribute("FlowUnid").toString());
BizObject dst= DataOperatorUtil.getSingleJBO(DISTRIBUTOR_INFO_TEMP.CLASS_NAME, fromCondtion, Sqlca);
- String disStatus = dst.getAttribute("distributor_status").toString();
- dst.setAttributeValue("orgid",orgid );
- BizObjectManager dit = JBOFactory.getBizObjectManager(DISTRIBUTOR_INFO_TEMP.CLASS_NAME,Sqlca);
- if("distributor_status08".equals(disStatus)){
- dst.setAttributeValue("distributor_status", "distributor_status09");
- }
- dit.saveObject(dst);
- MaptoCondtion=new HashMap();
- DistributorCompare dc=new DistributorCompare();
+ String distributor_no=dst.getAttribute("distributor_no").getString();
fromCondtion.clear();
- fromCondtion.put("flowunid",this.getAttribute("FlowUnid").toString());
- toCondtion.clear();
- toCondtion.put("distributor_no", dst.getAttribute("distributor_no").getString());
-
- DataOperatorUtil.copyJBOSet(DISTRIBUTOR_INFO_TEMP.CLASS_NAME, fromCondtion, DISTRIBUTOR_INFO.CLASS_NAME, toCondtion, null, dc, Sqlca);
+ fromCondtion.put("distributor_no", distributor_no);
+ BizObject disinfo= DataOperatorUtil.getSingleJBO(DISTRIBUTOR_INFO.CLASS_NAME, fromCondtion, Sqlca);
+ String disStatus = dst.getAttribute("distributor_status").toString();
+ BizObjectManager ditinfo = JBOFactory.getBizObjectManager(DISTRIBUTOR_INFO.CLASS_NAME,Sqlca);
+ if("distributor_status08".equals(disStatus)){
+ disinfo.setAttributeValue("distributor_status", "distributor_status09");
+ }
+ ditinfo.saveObject(disinfo);
String sMessage="true";
return sMessage;
}
@@ -48,7 +43,7 @@ public class CopyInfoTempToFormal extends BaseBussiness{
* Ϣ
* @author 2018-06-10
*/
- private String saveOrgInfo(Transaction Sqlca) throws Exception {
+ /*private String saveOrgInfo(Transaction Sqlca) throws Exception {
ASOrgObject orgObject= new ASOrgObject("8006");//ĬΪµϢ
Map mapOrgInfo=orgObject.nextLevalOrgNo(Sqlca);
BizObjectManager manager = JBOFactory.getFactory().getManager("jbo.sys.ORG_INFO");
@@ -74,5 +69,5 @@ public class CopyInfoTempToFormal extends BaseBussiness{
manager.saveObject(bo);
}
return bo.getAttribute("ORGID").toString();
- }
+ }*/
}