Merge branch 'main' of http://172.168.16.71:7070/taikai/taikai2312.git into main
This commit is contained in:
commit
6533f4405e
|
@ -1,18 +1,17 @@
|
|||
|
||||
package nccloud.openapi.so.m30;
|
||||
|
||||
import nc.itf.bd.defdoc.IDefdocService;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import javax.ws.rs.Consumes;
|
||||
import javax.ws.rs.POST;
|
||||
import javax.ws.rs.Path;
|
||||
import javax.ws.rs.Produces;
|
||||
import nc.jdbc.framework.processor.*;
|
||||
import nc.bd.itf.tools.BFPubTools;
|
||||
import nc.bs.dao.BaseDAO;
|
||||
import nc.bs.framework.common.InvocationInfoProxy;
|
||||
import nc.bs.framework.common.NCLocator;
|
||||
import nc.itf.bd.defdoc.IDefdocService;
|
||||
import nc.itf.pim.project.prv.IProject;
|
||||
import nc.jdbc.framework.processor.ColumnListProcessor;
|
||||
import nc.jdbc.framework.processor.ColumnProcessor;
|
||||
import nc.jdbc.framework.processor.MapProcessor;
|
||||
import nc.vo.bd.defdoc.DefdocVO;
|
||||
import nc.vo.pim.project.ProjectHeadVO;
|
||||
import nc.vo.pub.BusinessException;
|
||||
import nc.vo.pub.lang.UFDateTime;
|
||||
import nc.vo.pubapp.AppContext;
|
||||
|
@ -26,11 +25,15 @@ import nccloud.openapi.scmpub.pub.NCCPubRestResource;
|
|||
import nccloud.openapi.scmpub.pub.TransferCodeToPKTool;
|
||||
import nccloud.openapi.scmpub.pub.TransferMapToVOTool;
|
||||
import nccloud.openapi.scmpub.util.CallReturnBuildUtil;
|
||||
import nc.bs.dao.BaseDAO;
|
||||
import nc.bd.itf.tools.BFPubTools;
|
||||
import org.json.JSONString;
|
||||
import nc.vo.pim.project.ProjectHeadVO;
|
||||
import nc.itf.pim.project.prv.IProject;
|
||||
|
||||
import javax.ws.rs.Consumes;
|
||||
import javax.ws.rs.POST;
|
||||
import javax.ws.rs.Path;
|
||||
import javax.ws.rs.Produces;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
|
||||
/**
|
||||
|
@ -54,8 +57,8 @@ public class SaleOrderResource extends NCCPubRestResource {
|
|||
|
||||
@POST
|
||||
@Path("operation/save")
|
||||
@Consumes({ "application/json" })
|
||||
@Produces({ "application/json" })
|
||||
@Consumes({"application/json"})
|
||||
@Produces({"application/json"})
|
||||
public JSONString save(Map<String, Object> paramMap) {
|
||||
List<Map<String, Object>> paramList = (List) paramMap.get("array");
|
||||
return saveold(paramList);
|
||||
|
@ -80,7 +83,6 @@ public class SaleOrderResource extends NCCPubRestResource {
|
|||
}
|
||||
|
||||
/**
|
||||
*
|
||||
* @Description: 在2312基础上适配2005代码
|
||||
* @date: 2025年3月19日 18点11分
|
||||
* @version NCC2312
|
||||
|
@ -113,9 +115,9 @@ public class SaleOrderResource extends NCCPubRestResource {
|
|||
Map<String, Object> bodydata = (Map<String, Object>) body;
|
||||
bodydata.put("pk_group", pk_group);
|
||||
bodydata.put("cprojectid", headdata.get("vdef6"));
|
||||
//bodydata.put("ctrafficorgvid", headdata.get("pk_org_v"));
|
||||
// bodydata.put("ctrafficorgvid", headdata.get("pk_org_v"));
|
||||
bodydata.put("csendstockorgvid", headdata.get("pk_org_v"));
|
||||
//bodydata.put("csendstordocid", headdata.get("pk_org_v"));
|
||||
// bodydata.put("csendstordocid", headdata.get("pk_org_v"));
|
||||
bodydata.put("csendstockorgid", headdata.get("pk_org_v"));
|
||||
bodydata.put("carorgid", headdata.get("pk_org_v"));
|
||||
bodydata.put("carorgvid", headdata.get("pk_org_v"));
|
||||
|
@ -332,8 +334,8 @@ public class SaleOrderResource extends NCCPubRestResource {
|
|||
|
||||
@POST
|
||||
@Path("update")
|
||||
@Consumes({ "application/json" })
|
||||
@Produces({ "application/json" })
|
||||
@Consumes({"application/json"})
|
||||
@Produces({"application/json"})
|
||||
public JSONString update(Map<String, Object> paramMap) {
|
||||
try {
|
||||
if (paramMap == null || !paramMap.containsKey(HEADTABLE) || !paramMap.containsKey(BODYTABLE)) {
|
||||
|
@ -347,7 +349,10 @@ public class SaleOrderResource extends NCCPubRestResource {
|
|||
.lookup(IAPISaleOrderMaitain.class);
|
||||
SaleOrderVO[] results = service.update(paramList);
|
||||
|
||||
return ResultMessageUtil.toJSON(results, "ÏúÊÛ¶©µ¥Ð޸ijɹ¦");
|
||||
// return ResultMessageUtil.toJSON(results, "销售订单修改成功");
|
||||
// 包装返回信息
|
||||
return NCCRestUtils.toJSONString(CallReturnBuildUtil.buildSuccessResult(
|
||||
results, "销售订单修改成功"));
|
||||
} catch (Exception e) {
|
||||
return ResultMessageUtil.exceptionToJSON(e);
|
||||
}
|
||||
|
@ -355,8 +360,8 @@ public class SaleOrderResource extends NCCPubRestResource {
|
|||
|
||||
@POST
|
||||
@Path("operation/delete")
|
||||
@Consumes({ "application/json" })
|
||||
@Produces({ "application/json" })
|
||||
@Consumes({"application/json"})
|
||||
@Produces({"application/json"})
|
||||
public JSONString delete(Map<String, Object> paramMap) {
|
||||
ArrayList<String> paramArray = (ArrayList) paramMap.get("csaleorderid");
|
||||
String[] hids = (String[]) paramArray.toArray(new String[0]);
|
||||
|
@ -365,8 +370,8 @@ public class SaleOrderResource extends NCCPubRestResource {
|
|||
|
||||
@POST
|
||||
@Path("delete")
|
||||
@Consumes({ "application/json" })
|
||||
@Produces({ "application/json" })
|
||||
@Consumes({"application/json"})
|
||||
@Produces({"application/json"})
|
||||
public JSONString delete(String[] hids) {
|
||||
if (hids == null || hids.length == 0) {
|
||||
return ResultMessageUtil.exceptionToJSON("传入参数为空,请检查", APIErrCodeEnum.BUSINESSEXCCODE.getCode());
|
||||
|
@ -383,8 +388,8 @@ public class SaleOrderResource extends NCCPubRestResource {
|
|||
|
||||
@POST
|
||||
@Path("querybyscheme")
|
||||
@Consumes({ "application/json" })
|
||||
@Produces({ "application/json" })
|
||||
@Consumes({"application/json"})
|
||||
@Produces({"application/json"})
|
||||
public JSONString queryByScheme(Map<String, Object> paramMap) {
|
||||
SaleOrderVO[] resultVOs = null;
|
||||
|
||||
|
@ -400,8 +405,8 @@ public class SaleOrderResource extends NCCPubRestResource {
|
|||
|
||||
@POST
|
||||
@Path("sendapprove")
|
||||
@Consumes({ "application/json" })
|
||||
@Produces({ "application/json" })
|
||||
@Consumes({"application/json"})
|
||||
@Produces({"application/json"})
|
||||
public JSONString sendApprove(Map<String, Object> paramMap) {
|
||||
SaleOrderVO[] sendApprove = null;
|
||||
ArrayList<String> paramArray = (ArrayList) paramMap.get("csaleorderid");
|
||||
|
@ -421,8 +426,8 @@ public class SaleOrderResource extends NCCPubRestResource {
|
|||
|
||||
@POST
|
||||
@Path("unsend")
|
||||
@Consumes({ "application/json" })
|
||||
@Produces({ "application/json" })
|
||||
@Consumes({"application/json"})
|
||||
@Produces({"application/json"})
|
||||
public JSONString unSendApprove(Map<String, Object> paramMap) {
|
||||
SaleOrderVO[] unSend = null;
|
||||
ArrayList<String> paramArray = (ArrayList) paramMap.get("csaleorderid");
|
||||
|
@ -442,8 +447,8 @@ public class SaleOrderResource extends NCCPubRestResource {
|
|||
|
||||
@POST
|
||||
@Path("approve")
|
||||
@Consumes({ "application/json" })
|
||||
@Produces({ "application/json" })
|
||||
@Consumes({"application/json"})
|
||||
@Produces({"application/json"})
|
||||
public JSONString approve(Map<String, Object> paramMap) {
|
||||
SaleOrderVO[] aprove = null;
|
||||
ArrayList<String> paramArray = (ArrayList) paramMap.get("csaleorderid");
|
||||
|
@ -461,8 +466,8 @@ public class SaleOrderResource extends NCCPubRestResource {
|
|||
|
||||
@POST
|
||||
@Path("unapprove")
|
||||
@Consumes({ "application/json" })
|
||||
@Produces({ "application/json" })
|
||||
@Consumes({"application/json"})
|
||||
@Produces({"application/json"})
|
||||
public JSONString unApprove(Map<String, Object> paramMap) {
|
||||
SaleOrderVO[] unaprove = null;
|
||||
ArrayList<String> paramArray = (ArrayList) paramMap.get("csaleorderid");
|
||||
|
|
Loading…
Reference in New Issue