采购订单不做了，去掉相应代码

pu/.classpath

@@ -1,27 +1,25 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" output="pu/classes" path="pu/src/public"/>
-	<classpathentry kind="src" output="pu/classes" path="pu/src/client"/>
-	<classpathentry kind="src" output="pu/classes" path="pu/src/private"/>
-	<classpathentry kind="src" output="pu/classes" path="pu/src/test"/>
-	<classpathentry kind="src" output="pu/classes" path="pu/resources"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="com.yonyou.studio.udt.core.container/Ant_Library"/>
-	<classpathentry kind="con" path="com.yonyou.studio.udt.core.container/Product_Common_Library"/>
-	<classpathentry kind="con" path="com.yonyou.studio.udt.core.container/Middleware_Library"/>
-	<classpathentry kind="con" path="com.yonyou.studio.udt.core.container/Framework_Library"/>
-	<classpathentry kind="con" path="com.yonyou.studio.udt.core.container/Module_Public_Library"/>
-	<classpathentry kind="con" path="com.yonyou.studio.udt.core.container/Module_Client_Library"/>
-	<classpathentry kind="con" path="com.yonyou.studio.udt.core.container/Module_Private_Library">
-		<accessrules>
-			<accessrule kind="accessible" pattern="**"/>
-		</accessrules>
-	</classpathentry>
-	<classpathentry kind="con" path="com.yonyou.studio.udt.core.container/Module_Lang_Library"/>
-	<classpathentry kind="con" path="com.yonyou.studio.udt.core.container/Generated_EJB"/>
-	<classpathentry kind="lib" path="META-INF/commons-pool2-2.4.2.jar"/>
-	<classpathentry kind="lib" path="META-INF/jedis-2.9.0.jar"/>
-	<classpathentry kind="lib" path="META-INF/hutool-all-5.3.0.jar"/>
-	<classpathentry kind="lib" path="META-INF/hutool-all-5.8.11.jar"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" output="pu/classes" path="pu/src/public"/>
+	<classpathentry kind="src" output="pu/classes" path="pu/src/client"/>
+	<classpathentry kind="src" output="pu/classes" path="pu/src/private"/>
+	<classpathentry kind="src" output="pu/classes" path="pu/src/test"/>
+	<classpathentry kind="src" output="pu/classes" path="pu/resources"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="com.yonyou.studio.udt.core.container/Ant_Library"/>
+	<classpathentry kind="con" path="com.yonyou.studio.udt.core.container/Product_Common_Library"/>
+	<classpathentry kind="con" path="com.yonyou.studio.udt.core.container/Middleware_Library"/>
+	<classpathentry kind="con" path="com.yonyou.studio.udt.core.container/Framework_Library"/>
+	<classpathentry kind="con" path="com.yonyou.studio.udt.core.container/Module_Public_Library"/>
+	<classpathentry kind="con" path="com.yonyou.studio.udt.core.container/Module_Client_Library"/>
+	<classpathentry kind="con" path="com.yonyou.studio.udt.core.container/Module_Private_Library">
+		<accessrules>
+			<accessrule kind="accessible" pattern="**"/>
+		</accessrules>
+	</classpathentry>
+	<classpathentry kind="con" path="com.yonyou.studio.udt.core.container/Module_Lang_Library"/>
+	<classpathentry kind="con" path="com.yonyou.studio.udt.core.container/Generated_EJB"/>
+	<classpathentry kind="lib" path="META-INF/commons-pool2-2.4.2.jar"/>
+	<classpathentry kind="lib" path="META-INF/jedis-2.9.0.jar"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

pu/META-INF/ocritf.upm

@@ -7,10 +7,4 @@
 	      <implementation>nc.impl.th.ThOcrServiceImpl</implementation>
 	    </component>
 	</public>
-	
-		<public>
-		   <component name="ApproveOrder" accessProtected="false"  remote="true" singleton="true" tx="NONE" supportAlias="true">
-	      <implementation>nc.impl.th.ThOrderServiceImpl</implementation>
-	    </component>
-	</public>
 </module>

pu/META-INF/thopenapi.upm

@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding='gb2312'?>
-<module name="pu">
-    <public>
- 	    <component remote="true" singleton="true" tx="NONE">
-            <interface>nc.itf.pu.service.IInvoiceOCRMaintain</interface>
-            <implementation>nc.impl.pu.service.InvoiceOCRMaintainImpl</implementation>
-        </component>
-    </public>	
+<?xml version="1.0" encoding='gb2312'?>
+<module name="pu">
+    <public>
+ 	    <component remote="true" singleton="true" tx="NONE">
+            <interface>nc.itf.pu.service.IInvoiceOCRMaintain</interface>
+            <implementation>nc.impl.pu.service.InvoiceOCRMaintainImpl</implementation>
+        </component>
+    </public>
 </module>

pu/pu/src/client/nc/pub/filesystem/newui/ThOCRAction.java

@@ -354,7 +354,7 @@ public class ThOCRAction extends AbstractNCAction{
 				}
 			}
 		}
-		MessageDialog.showHintDlg(parentpanel, "提示","识别成功！");
+		MessageDialog.showHintDlg(parentpanel, "提示","识别结束！");
 	}
 	
 

pu/pu/src/private/nc/bs/ic/base/OrderAfterSubmitEvent.java

@@ -1,125 +0,0 @@
-package nc.bs.ic.base;
-
-import com.alibaba.fastjson.JSONArray;
-
-import nc.impl.pubapp.pattern.rule.IRule;
-import nc.vo.pu.m21.entity.OrderVO;
-import net.sf.json.JSONObject;
-
-/**
- * 采购订单提交后传OA
- * @author Yaoyu
- * 2023/07/17
- */
-public class OrderAfterSubmitEvent implements IRule<OrderVO>{
-
-	@Override
-	public void process(OrderVO[] vos) {
-		for (int i = 0; i < vos.length; i++) {
-			//表头
-			JSONObject mainData = new JSONObject();
-			//
-			mainData.put("fieldName", null);
-			mainData.put("fieldValue", null);
-			//采购组织
-			JSONObject cgzz = new JSONObject();
-			cgzz.put("fieldName", null);
-			cgzz.put("fieldValue", null);
-			//订单编号
-			JSONObject ddbh = new JSONObject();
-			ddbh.put("fieldName", null);
-			ddbh.put("fieldValue", null);
-			//订单日期
-			JSONObject ddrq = new JSONObject();
-			ddrq.put("fieldName", null);
-			ddrq.put("fieldValue", null);
-			//订单类型
-			JSONObject ddlx = new JSONObject();
-			ddlx.put("fieldName", null);
-			ddlx.put("fieldValue", null);
-			//供应商
-			JSONObject gys = new JSONObject();
-			gys.put("fieldName", null);
-			gys.put("fieldValue", null);
-			//计划员
-			JSONObject jhy = new JSONObject();
-			jhy.put("fieldName", null);
-			jhy.put("fieldValue", null);
-			//计划部门
-			JSONObject jhbm = new JSONObject();
-			jhbm.put("fieldName", null);
-			jhbm.put("fieldValue", null);
-			//采购员
-			JSONObject cgy = new JSONObject();
-			cgy.put("fieldName", null);
-			cgy.put("fieldValue", null);
-			//采购部门
-			JSONObject cgbm = new JSONObject();
-			cgbm.put("fieldName", null);
-			cgbm.put("fieldValue", null);
-			//是否需要招投标
-			JSONObject sfxyztb = new JSONObject();
-			sfxyztb.put("fieldName", null);
-			sfxyztb.put("fieldValue", null);
-			//有无框架协议
-			JSONObject ywkjxy = new JSONObject();
-			ywkjxy.put("fieldName", null);
-			ywkjxy.put("fieldValue", null);
-			//预算名称
-			JSONObject ysmc = new JSONObject();
-			ysmc.put("fieldName", null);
-			ysmc.put("fieldValue", null);
-			//预算编号
-			JSONObject ysbh = new JSONObject();
-			ysbh.put("fieldName", null);
-			ysbh.put("fieldValue", null);
-			//预算所在部门
-			JSONObject ysszbm = new JSONObject();
-			ysszbm.put("fieldName", null);
-			ysszbm.put("fieldValue", null);
-			//是否有附件
-			JSONObject sfyfj = new JSONObject();
-			sfyfj.put("fieldName", null);
-			sfyfj.put("fieldValue", null);
-			//总数量
-			JSONObject zsl = new JSONObject();
-			zsl.put("fieldName", null);
-			zsl.put("fieldValue", null);
-			//价税合计
-			JSONObject jshj = new JSONObject();
-			jshj.put("fieldName", null);
-			jshj.put("fieldValue", null);
-			//备注
-			JSONObject bz = new JSONObject();
-			bz.put("fieldName", null);
-			bz.put("fieldValue", null);
-			//判断前端后无合同
-			JSONObject pdqdywht = new JSONObject();
-			pdqdywht.put("fieldName", null);
-			pdqdywht.put("fieldValue", null);
-			//判断合同是否框架协议
-			JSONObject pdhtsfkjxy = new JSONObject();
-			pdhtsfkjxy.put("fieldName", null);
-			pdhtsfkjxy.put("fieldValue", null);
-			//一个合同关联订单累计金额
-			JSONObject pdtyghtglddljje = new JSONObject();
-			pdtyghtglddljje.put("fieldName", null);
-			pdtyghtglddljje.put("fieldValue", null);
-			//判断是否月结
-			JSONObject pdsfyj = new JSONObject();
-			pdsfyj.put("fieldName", null);
-			pdsfyj.put("fieldValue", null);
-			JSONObject fieldValue = new JSONObject();
-		    fieldValue.put("filePath", "https://autoaccount.thape.com.cn/uploads/20220908/0a44e9b50b8b6143771eb6eb238ea82a.png");
-		    fieldValue.put("fileName", "test.png");
-		    // 创建包含fieldName和fieldValue的JSONArray
-		    JSONArray jsonArray = new JSONArray();
-		    jsonArray.add(fieldValue);
-		    //附件
-		    JSONObject fj = new JSONObject();
-		    // 将fieldName和fieldValue放入最终的JSONObject
-		    fj.put("fieldName", null);
-		    fj.put("fieldValue", jsonArray);
-		}
-	}
-}

pu/pu/src/private/nc/bs/ic/base/OrderAfterUnSubmitEvent.java

@@ -1,19 +0,0 @@
-package nc.bs.ic.base;
-
-import nc.impl.pubapp.pattern.rule.IRule;
-import nc.vo.pu.m21.entity.OrderVO;
-
-/**
- * ²É¹º¶©µ¥ÊÕ»Øɾ³ýOAµ¥¾Ý
- * @author Yaoyu	
- *2023/07/17
- */
-public class OrderAfterUnSubmitEvent implements IRule<OrderVO>{
-
-	@Override
-	public void process(OrderVO[] vos) {
-		// TODO Auto-generated method stub
-		
-	}
-
-}

pu/pu/src/private/nc/impl/pu/m21/action/OrderSendApproveAction.java

@@ -1,38 +0,0 @@
-package nc.impl.pu.m21.action;
-
-import nc.bs.ic.base.OrderAfterSubmitEvent;
-import nc.bs.pu.m21.plugin.OrderPluginPoint;
-import nc.bs.pub.compiler.AbstractCompiler2;
-import nc.bs.scmpub.pf.PfParameterUtil;
-import nc.impl.pu.m21.action.rule.approve.SendAppoveVOValidateRule;
-import nc.impl.pu.m21.action.rule.approve.SendApproveAfterRule;
-import nc.impl.pu.m21.action.rule.approve.SendApproveBeforeEventRule;
-import nc.impl.pu.m21.action.rule.approve.SendApproveFlowCheckRule;
-import nc.impl.pu.m21.action.rule.approve.SendApproveStatusChangeRule;
-import nc.impl.pubapp.pattern.data.bill.BillUpdate;
-import nc.impl.pubapp.pattern.rule.processer.AroundProcesser;
-import nc.vo.pu.m21.entity.OrderVO;
-
-public class OrderSendApproveAction {
-	public OrderVO[] sendApprove(OrderVO[] vos, AbstractCompiler2 script) {
-		PfParameterUtil<OrderVO> util = new PfParameterUtil(script.getPfParameterVO(), vos);
-		OrderVO[] originBills = (OrderVO[]) util.getOrginBills();
-		OrderVO[] clientBills = (OrderVO[]) util.getClientFullInfoBill();
-		AroundProcesser<OrderVO> processor = new AroundProcesser(OrderPluginPoint.SEND_APPROVE);
-		this.addRule(processor);
-		processor.before(clientBills);
-		OrderVO[] returnVos = (OrderVO[]) (new BillUpdate()).update(clientBills, originBills);
-		processor.after(returnVos);
-		return returnVos;
-	}
-
-	private void addRule(AroundProcesser<OrderVO> processer) {
-		processer.addBeforeFinalRule(new SendApproveFlowCheckRule());
-		processer.addBeforeFinalRule(new SendAppoveVOValidateRule());
-		processer.addBeforeFinalRule(new SendApproveStatusChangeRule());
-		processer.addBeforeRule(new SendApproveBeforeEventRule());
-		processer.addAfterRule(new SendApproveAfterRule());
-		processer.addAfterRule(new OrderAfterSubmitEvent());
-		
-	}
-}

pu/pu/src/private/nc/impl/pu/m21/action/OrderUnSendApproveAction.java

@@ -1,47 +0,0 @@
-package nc.impl.pu.m21.action;
-
-import nc.bs.ic.base.OrderAfterUnSubmitEvent;
-import nc.bs.pu.m21.plugin.OrderPluginPoint;
-import nc.bs.pub.compiler.AbstractCompiler2;
-import nc.bs.scmpub.pf.PfParameterUtil;
-import nc.impl.pu.m21.action.rule.approve.UnSendAppoveVOValidateRule;
-import nc.impl.pu.m21.action.rule.approve.UnSendApproveAfterEventRule;
-import nc.impl.pu.m21.action.rule.approve.UnSendApproveBeforeEventRule;
-import nc.impl.pubapp.pattern.data.bill.BillUpdate;
-import nc.impl.pubapp.pattern.rule.processer.AroundProcesser;
-import nc.vo.pu.m21.entity.OrderVO;
-import nc.vo.pubapp.pattern.exception.ExceptionUtils;
-
-public class OrderUnSendApproveAction {
-	public OrderVO[] unSendApprove(OrderVO[] vos, AbstractCompiler2 script) {
-		PfParameterUtil<OrderVO> util = new PfParameterUtil(script == null ? null : script.getPfParameterVO(), vos);
-		OrderVO[] originBills = (OrderVO[]) util.getOrginBills();
-		OrderVO[] clientBills = (OrderVO[]) util.getClientFullInfoBill();
-		AroundProcesser<OrderVO> processer = new AroundProcesser(OrderPluginPoint.UNSAVE);
-		this.addBeforeRule(processer);
-		this.addAfterRule(processer);
-		processer.before(clientBills);
-		if (null != script) {
-			try {
-				script.procRecallFlow(script.getPfParameterVO());
-			} catch (Exception var9) {
-				ExceptionUtils.wrappException(var9);
-			}
-		}
-
-		BillUpdate<OrderVO> update = new BillUpdate();
-		OrderVO[] returnVos = (OrderVO[]) update.update(clientBills, originBills);
-		processer.after(returnVos);
-		return returnVos;
-	}
-
-	private void addBeforeRule(AroundProcesser<OrderVO> processer) {
-		processer.addBeforeFinalRule(new UnSendAppoveVOValidateRule());
-		processer.addBeforeRule(new UnSendApproveBeforeEventRule());
-	}
-
-	private void addAfterRule(AroundProcesser<OrderVO> processer) {
-		processer.addAfterRule(new UnSendApproveAfterEventRule());
-		processer.addAfterRule(new OrderAfterUnSubmitEvent());
-	}
-}

pu/pu/src/private/nc/impl/th/OrderSendOA.java

@@ -1,162 +0,0 @@
-package nc.impl.th;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.jeecg.common.util.DataUtill;
-
-import com.alibaba.fastjson.JSONObject;
-
-import cn.hutool.core.util.CharsetUtil;
-import cn.hutool.core.util.StrUtil;
-import cn.hutool.crypto.asymmetric.KeyType;
-import cn.hutool.crypto.asymmetric.RSA;
-import cn.hutool.http.HttpRequest;
-import cn.hutool.json.JSONUtil;
-import nc.bs.dao.BaseDAO;
-/**
- * Token认证测试
- *
- *  认证过程主要采用RSA非对称加密算法
- *
- * @author tzf 2020/6/9
- */
-public class OrderSendOA {
-    /**
-     * 模拟缓存服务
-     */
-    private static  Map<String,String> SYSTEM_CACHE = new HashMap <String,String>();
-    
-    private static String address = "http://bx.thape.com.cn:8080";
-    private static String api = "/api/system/appmanage/route";
-    
-    static BaseDAO basedao = new BaseDAO();
-    /**
-     * ecology系统发放的授权许可证(appid)
-     */
-    private static final String APPID = "SHTH-NC-20230720";
-
-    /**
-     * 第一步：
-     *
-     * 调用ecology注册接口,根据appid进行注册,将返回服务端公钥和Secret信息
-     */
-    public static Map<String,Object> testRegist(String address){
-        //获取当前系统RSA加密的公钥
-        RSA rsa = new RSA();
-        String publicKey = rsa.getPublicKeyBase64();
-        String privateKey = rsa.getPrivateKeyBase64();
-        // 客户端RSA私钥
-        SYSTEM_CACHE.put("LOCAL_PRIVATE_KEY",privateKey);
-        // 客户端RSA公钥
-        SYSTEM_CACHE.put("LOCAL_PUBLIC_KEY",publicKey);
-        //调用ECOLOGY系统接口进行注册
-//        String data = HttpRequest.post(address + "/api/ec/dev/auth/regist")
-//                .header("appid",APPID)
-//                .header("cpk",publicKey)
-//                .timeout(2000)
-//                .execute().body();
-        String data = "{\"msg\":\"ok\",\"code\":0,\"msgShowType\":\"none\",\"secrit\":\"9f8dcd63-86b0-4be8-86d0-feeb2919ed9c\",\"secret\":\"9f8dcd63-86b0-4be8-86d0-feeb2919ed9c\",\"status\":true,\"spk\":\"MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmx1HfTtkjYDzYrIb95v382KyzJlNpkVHZ3W/OjxMm9pvlaJlrEY6rF9Q8ASeK4RBlHkPyq5SsfQBPjHMHmjKU0j1I+VSOL7qpipDvBfmxAZVGH+VehJeP3DvV94Z8n1nfBoQrMEsSfu4obvFQ6LkCxV9Ev6bKPdV1yJb89uOJYoxdDb/E/SuP8KK6HqsIv9M98TDofaZRaY3G/iKnHQUGKqoXNc4YwI6AxKXBl90mOCViydHvjcxbj4qJGWP0tQ97xRH9gEGk/v5Ezf68u4Z25K2eFu377y4VfJRzAuGwgpTCp6JZxnL1oJ3Hft/5mKfzGKkcbrzSLeMvsKKuo2tmwIDAQAB\"}";
-        // 打印ECOLOGY响应信息
-        System.out.println("testRegist()："+data);
-        Map<String,Object> datas = JSONUtil.parseObj(data);
-        //ECOLOGY返回的系统公钥
-        SYSTEM_CACHE.put("SERVER_PUBLIC_KEY",StrUtil.nullToEmpty((String)datas.get("spk")));
-        //ECOLOGY返回的系统密钥
-        SYSTEM_CACHE.put("SERVER_SECRET",StrUtil.nullToEmpty((String)datas.get("secrit")));
-        //将数据存入数据库
-        return datas;
-    }
-    /**
-     * 第二步：
-     *
-     * 通过第一步中注册系统返回信息进行获取token信息
-     * @throws Exception 
-     */
-    public static Map<String,Object> testGetoken(String address) throws Exception{
-        String secret = null;
-        String spk = null;
-    	String str = DataUtill.queryRegist();
-    	//如果为1,说明还未进行注册,调用注册接口进行注册认证与数据更新
-    	if("1".equals(str)) {
-    		 testRegist(address);
-             // 重新获取最新ECOLOGY系统公钥和Secret信息
-             secret = SYSTEM_CACHE.get("SERVER_SECRET");
-             spk = SYSTEM_CACHE.get("SERVER_PUBLIC_KEY");
-             //将数据信息存入
-             JSONObject defaultvalue = new JSONObject();
-             defaultvalue.put("SERVER_SECRET", SYSTEM_CACHE.get("SERVER_SECRET"));
-             defaultvalue.put("SERVER_PUBLIC_KEY", SYSTEM_CACHE.get("SERVER_PUBLIC_KEY"));
-    	}else {
-    		JSONObject defaultvalue = JSONObject.parseObject(str);
-    		secret = defaultvalue.getString("");
-            spk = defaultvalue.getString("SERVER_PUBLIC_KEY");
-            Update(defaultvalue.toString());
-    	}
-        // 公钥加密,所以RSA对象私钥为null
-        RSA rsa = new RSA(null,spk);
-        //对秘钥进行加密传输，防止篡改数据
-        String encryptSecret = rsa.encryptBase64(secret,CharsetUtil.CHARSET_UTF_8,KeyType.PublicKey);
-        //调用ECOLOGY系统接口进行注册
-        String data = HttpRequest.post(address+ "/api/ec/dev/auth/applytoken")
-                .header("appid",APPID)
-                .header("secret",encryptSecret)
-                .header("time","3600")
-                .execute().body();
-        System.out.println("testGetoken()："+data);
-        Map<String,Object> datas = JSONUtil.parseObj(data);
-        //ECOLOGY返回的token
-        // TODO 为Token缓存设置过期时间
-        SYSTEM_CACHE.put("SERVER_TOKEN",StrUtil.nullToEmpty((String)datas.get("token")));
-        return datas;
-    }
-    /**
-     * 第三步：
-     *
-     * 调用ecology系统的rest接口，请求头部带上token和用户标识认证信息
-     *
-     * @param address ecology系统地址
-     * @param api rest api 接口地址(该测试代码仅支持GET请求)
-     * @param jsonParams 请求参数json串
-     *
-     * 注意：ECOLOGY系统所有POST接口调用请求头请设置 "Content-Type","application/x-www-form-urlencoded; charset=utf-8"
-     * @throws Exception 
-     */
-    public static String testRestful(String jsonParams) throws Exception{
-        //ECOLOGY返回的token
-        String token= SYSTEM_CACHE.get("SERVER_TOKEN");
-        if (StrUtil.isEmpty(token)){
-            token = (String) testGetoken(address).get("token");
-        }
-        String spk = SYSTEM_CACHE.get("SERVER_PUBLIC_KEY");
-        //封装请求头参数
-        RSA rsa = new RSA(null,spk);
-        //对用户信息进行加密传输,暂仅支持传输OA用户ID
-        String encryptUserid = rsa.encryptBase64("1",CharsetUtil.CHARSET_UTF_8,KeyType.PublicKey);
-        //调用ECOLOGY系统接口，注意此处的disableCookie，可翻阅hutool的文档查看
-//        HttpRequest request = HttpRequest.get(address + api);
-//        request.disableCookie();
-//        String data = HttpRequest
-//                .get(address + api)
-//                .header("appid",APPID)
-//                .header("token",token)
-//                .header("userid",encryptUserid)
-//                .body(jsonParams)
-//                .execute().body();
-//        System.out.println("testRestful()："+data);
-        return null;
-    }
-    /**
-     * 
-     * @param data
-     * @throws Exception 
-     */
-    public static void Update(String data) throws Exception {
-    	String sql = "update pub_sysinittemp set defaultvalue = '"+data+"' where initcode ='OAZCRZ'";
-    	basedao.executeUpdate(sql.toString());
-    }
-    
-    
-    public static void main(String[] args) throws Exception {
-        testRestful("1");
-    }
-}

pu/pu/src/private/nc/impl/th/ThOrderServiceImpl.java

@@ -1,141 +0,0 @@
-package nc.impl.th;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import nc.bs.framework.adaptor.IHttpServletAdaptor;
-import nc.bs.framework.common.InvocationInfoProxy;
-import nc.bs.framework.common.NCLocator;
-import nc.bs.framework.server.ISecurityTokenCallback;
-import nc.bs.servlet.service.BaseServlet;
-import nc.itf.uap.IUAPQueryBS;
-import nc.itf.uap.pf.IplatFormEntry;
-import nc.jdbc.framework.processor.ColumnProcessor;
-import nc.log.NcLog;
-import nc.md.persist.framework.IMDPersistenceQueryService;
-import nc.pub.util.DataSourceUtil;
-import nc.vo.pu.m21.entity.OrderVO;
-import nc.vo.pub.BusinessException;
-import net.sf.json.JSONObject;
-
-
-/**
- * 采购订单审批
- * @author Yaoyu
- *2023/07/14
- */
-public class ThOrderServiceImpl extends BaseServlet implements IHttpServletAdaptor{
-	private IUAPQueryBS iuap = (IUAPQueryBS) NCLocator.getInstance().lookup(IUAPQueryBS.class.getName());
-	private IMDPersistenceQueryService service = NCLocator.getInstance().lookup(IMDPersistenceQueryService.class);
-	private String vbillcode = null;
-	@Override
-	public void doAction(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
-		try {
-			String data = buildJson(req, resp, this.getClass().getName());
-			NcLog.info("采购订单审批开始,JSON:"+data);
-			JSONObject json = JSONObject.fromObject(data);
-			vbillcode = json.getString("vbillcode");
-			checkJson(json);
-			// 登录NC
-			NCLocator.getInstance().lookup(ISecurityTokenCallback.class).token("NCSystem".getBytes(),"pfxx".getBytes());
-			//根据单据号查询pk后根据pk或者AggVO
-			OrderVO orderVO = (OrderVO) service.queryBillOfNCObjectByPKWithDR(OrderVO.class, QuyOrderPK(vbillcode,json.getString("pk_org")), true).getContainmentObject();
-			//用户id
-			String pk_user = QuyUserPk(json.getString("approver"));
-			setInstance(json.getString("taudittime"),pk_user,orderVO.getParent().getAttributeValue("pk_group").toString());
-			//调用审批动作脚本
-			IplatFormEntry ipf = NCLocator.getInstance().lookup(IplatFormEntry.class);
-			ipf.processAction("APPROVE", "21", null, orderVO, null, null);
-			resp.getWriter().write(formatRSJsonData("成功","",vbillcode).toString());
-		} catch (Exception e) {
-			e.printStackTrace();
-			StringWriter stringWriter = new StringWriter();
-			e.printStackTrace(new PrintWriter(stringWriter));
-			//获取详细信息
-			String msg=stringWriter.getBuffer().toString();
-			NcLog.info("采购订单同步失败："+msg);
-			resp.getWriter().write(formatRSJsonData("失败",e.getMessage() == null ? "" : e.getMessage(),vbillcode).toString());
-		}
-	}
-	
-	
-	/**
-	 * 非空判断
-	 * @param json
-	 * @throws Exception
-	 */
-	private void checkJson(JSONObject json) throws Exception {
-		
-		StringBuffer mags = new StringBuffer();
-		String groupCode = "groupCode";//集团编码
-		String pk_org = "pk_org";//组织编码
-		String vbillcode = "vbillcode";//采购订单号
-		String approver = "approver";//审批人
-		String taudittime = "taudittime";//审批时间
- 
-		String[] HeadKey = {groupCode,pk_org,vbillcode,approver,taudittime};
-		
-		for (String as : HeadKey) {
-
-			if (json.getString(as).isEmpty()) {
-				mags.append("'" + as + "'");
-			}
-		}
-		
-		if (mags.length()!=0) {
-			throw new Exception("以下字段不可为空："+mags);
-		}
-	}
-	
-	/**
-	 * 设置线程
-	 * @throws BusinessException
-	 */
-	private void setInstance(String taudittime,String user_pk,String pk_group) throws Exception {
-		DataSourceUtil.setDataSource();
-		// 线程设置用户主键
-		InvocationInfoProxy.getInstance().setUserId(user_pk);
-		SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-		Date date = format.parse(taudittime);
-		long timestamp = date.getTime();
-		// 线程设置业务日期
-		InvocationInfoProxy.getInstance().setBizDateTime(timestamp);
-		// 线程设置集团主键
-		InvocationInfoProxy.getInstance().setGroupId(pk_group);
-	}
-	
-	/**
-	 * 根据单据号查询单据主键
-	 * @param vbillcode
-	 * @return 单据主键
-	 * @throws Exception
-	 */
-	private String QuyOrderPK(String vbillcode,String pk_org) throws Exception {
-		String sql = "select pk_order from po_order where pk_org = (select pk_purchaseorg  from org_purchaseorg where code = '"+pk_org+"') and vbillcode = '"+vbillcode+"' and nvl(dr,0) = 0";
-		String pk_order =  (String) iuap.executeQuery(sql,new ColumnProcessor());
-		if(pk_order == null) {
-			throw new Exception("采购订单单据号:"+vbillcode+"不存在，请检查");
-		}
-		return pk_order;
-	}
-	
-	private String QuyUserPk(String approver) throws Exception {
-		String sql = "select cuserid  from sm_user where user_code='"+approver+"' and enablestate = 2 and nvl(dr,0) = 0";
-		String pk_user= (String) iuap.executeQuery(sql,new ColumnProcessor());
-		if(pk_user == null) {
-			throw new Exception("用户"+approver+"不存在,请检查!");
-		}
-		return pk_user;
-	}
-	
-	
-	
-
-}

pu/pu/src/private/org/jeecg/common/util/DataUtill.java

@@ -1,19 +0,0 @@
-package org.jeecg.common.util;
-
-import nc.bs.framework.common.NCLocator;
-import nc.itf.uap.IUAPQueryBS;
-import nc.jdbc.framework.processor.ColumnProcessor;
-
-public class DataUtill {
-
-	private static IUAPQueryBS iUAPQueryBS = (IUAPQueryBS) NCLocator.getInstance().lookup(IUAPQueryBS.class.getName());
-	
-	public static String queryRegist() throws Exception {
-		String sql = "select defaultvalue from pub_sysinittemp where initcode ='OAZCRZ'";
-		String defaultvalue = (String) iUAPQueryBS.executeQuery(sql, new ColumnProcessor());
-		if(defaultvalue == null) {
-			throw new Exception("参数模板设置未配置初始信息!");
-		}
-		return defaultvalue;
-	}
-}