采购订单调整

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/failDocument/controller/SyFailDocumentController.java

@@ -0,0 +1,167 @@
+package org.jeecg.modules.documents.failDocument.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.documents.failDocument.entity.SyFailDocument;
+import org.jeecg.modules.documents.failDocument.service.ISyFailDocumentService;
+import java.util.Date;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+ /**
+ * @Description: 失败单据汇总表
+ * @Author: jeecg-boot
+ * @Date:   2022-04-28
+ * @Version: V1.0
+ */
+@Slf4j
+@Api(tags="失败单据汇总表")
+@RestController
+@RequestMapping("/failDocument/syFailDocument")
+public class SyFailDocumentController extends JeecgController<SyFailDocument, ISyFailDocumentService> {
+	@Autowired
+	private ISyFailDocumentService syFailDocumentService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param syFailDocument
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@AutoLog(value = "失败单据汇总表-分页列表查询")
+	@ApiOperation(value="失败单据汇总表-分页列表查询", notes="失败单据汇总表-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<?> queryPageList(SyFailDocument syFailDocument,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<SyFailDocument> queryWrapper = QueryGenerator.initQueryWrapper(syFailDocument, req.getParameterMap());
+		Page<SyFailDocument> page = new Page<SyFailDocument>(pageNo, pageSize);
+		IPage<SyFailDocument> pageList = syFailDocumentService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 * 添加
+	 *
+	 * @param syFailDocument
+	 * @return
+	 */
+	@AutoLog(value = "失败单据汇总表-添加")
+	@ApiOperation(value="失败单据汇总表-添加", notes="失败单据汇总表-添加")
+	@PostMapping(value = "/add")
+	public Result<?> add(@RequestBody SyFailDocument syFailDocument) {
+		syFailDocumentService.save(syFailDocument);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 * 编辑
+	 *
+	 * @param syFailDocument
+	 * @return
+	 */
+	@AutoLog(value = "失败单据汇总表-编辑")
+	@ApiOperation(value="失败单据汇总表-编辑", notes="失败单据汇总表-编辑")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<?> edit(@RequestBody SyFailDocument syFailDocument) {
+		syFailDocumentService.updateById(syFailDocument);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 * 通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "失败单据汇总表-通过id删除")
+	@ApiOperation(value="失败单据汇总表-通过id删除", notes="失败单据汇总表-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
+		syFailDocumentService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 * 批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "失败单据汇总表-批量删除")
+	@ApiOperation(value="失败单据汇总表-批量删除", notes="失败单据汇总表-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.syFailDocumentService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功！");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "失败单据汇总表-通过id查询")
+	@ApiOperation(value="失败单据汇总表-通过id查询", notes="失败单据汇总表-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
+		SyFailDocument syFailDocument = syFailDocumentService.getById(id);
+		return Result.OK(syFailDocument);
+	}
+
+  /**
+   * 导出excel
+   *
+   * @param request
+   * @param syFailDocument
+   */
+  @RequestMapping(value = "/exportXls")
+  public ModelAndView exportXls(HttpServletRequest request, SyFailDocument syFailDocument) {
+      return super.exportXls(request, syFailDocument, SyFailDocument.class, "失败单据汇总表");
+  }
+
+  /**
+   * 通过excel导入数据
+   *
+   * @param request
+   * @param response
+   * @return
+   */
+  @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+  public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+      return super.importExcel(request, response, SyFailDocument.class);
+  }
+
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/failDocument/entity/SyFailDocument.java

@@ -0,0 +1,55 @@
+package org.jeecg.modules.documents.failDocument.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+/**
+ * @Description: 失败单据汇总表
+ * @Author: jeecg-boot
+ * @Date:   2022-04-28
+ * @Version: V1.0
+ */
+@Data
+@TableName("sy_fail_document")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="sy_fail_document对象", description="失败单据汇总表")
+public class SyFailDocument {
+    
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+	private java.lang.String id;
+	/**单据类型*/
+	@Excel(name = "单据类型", width = 15)
+    @ApiModelProperty(value = "单据类型")
+	private java.lang.String documentType;
+	/**单据号*/
+	@Excel(name = "单据号", width = 15)
+    @ApiModelProperty(value = "单据号")
+	private java.lang.String documentNo;
+	/**单据日期*/
+	@Excel(name = "单据日期", width = 15)
+    @ApiModelProperty(value = "单据日期")
+	private java.lang.String documentDate;
+	/**单据状态（0失败，1成功）*/
+	@Excel(name = "单据状态（0失败，1成功）", width = 15)
+    @ApiModelProperty(value = "单据状态（0失败，1成功）")
+	private java.lang.String documentStatus;
+	/**原因*/
+	@Excel(name = "原因", width = 15)
+    @ApiModelProperty(value = "原因")
+	private java.lang.Object reason;
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/failDocument/mapper/SyFailDocumentMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.documents.failDocument.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.documents.failDocument.entity.SyFailDocument;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 失败单据汇总表
+ * @Author: jeecg-boot
+ * @Date:   2022-04-28
+ * @Version: V1.0
+ */
+public interface SyFailDocumentMapper extends BaseMapper<SyFailDocument> {
+
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/failDocument/mapper/xml/SyFailDocumentMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.documents.failDocument.mapper.SyFailDocumentMapper">
+
+</mapper>

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/failDocument/service/ISyFailDocumentService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.documents.failDocument.service;
+
+import org.jeecg.modules.documents.failDocument.entity.SyFailDocument;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 失败单据汇总表
+ * @Author: jeecg-boot
+ * @Date:   2022-04-28
+ * @Version: V1.0
+ */
+public interface ISyFailDocumentService extends IService<SyFailDocument> {
+
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/failDocument/service/impl/SyFailDocumentServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.documents.failDocument.service.impl;
+
+import org.jeecg.modules.documents.failDocument.entity.SyFailDocument;
+import org.jeecg.modules.documents.failDocument.mapper.SyFailDocumentMapper;
+import org.jeecg.modules.documents.failDocument.service.ISyFailDocumentService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 失败单据汇总表
+ * @Author: jeecg-boot
+ * @Date:   2022-04-28
+ * @Version: V1.0
+ */
+@Service
+public class SyFailDocumentServiceImpl extends ServiceImpl<SyFailDocumentMapper, SyFailDocument> implements ISyFailDocumentService {
+
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/openApi/controller/MOMainController.java

@@ -11,6 +11,9 @@ import com.google.gson.GsonBuilder;
 import lombok.extern.log4j.Log4j2;
 
 import org.apache.commons.lang.StringEscapeUtils;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.documents.failDocument.entity.SyFailDocument;
+import org.jeecg.modules.documents.failDocument.service.ISyFailDocumentService;
 import org.jeecg.modules.openApi.entity.DxpDataPlan;
 import org.jeecg.modules.openApi.service.IDxpDataPlanService;
 import org.jeecg.modules.openApi.service.ISenYuDataSourceOne;
@@ -50,6 +53,8 @@ public class MOMainController implements ApplicationContextAware {
     private static ISenYuDataSourceTwo senYuDataSourceTwo;
     //数据源one
     private static ISenYuDataSourceThree iSenYuDataSourceThree;
+    @Autowired
+    private ISyFailDocumentService iSyFailDocumentService;
 
 
     @PostMapping(value = "/QueryMoMain")
@@ -91,11 +96,11 @@ public class MOMainController implements ApplicationContextAware {
                 if (pkorgValue[0].equals("one")) {//mo.cPersonCode as 'salerId',hr.cPsn_Num as 'buyerId',
                     String sql = "select mo.MOID as 'moId',mo.MOID as 'moId','"+ac+"' as accId,'"+pkorgValue[0]+"' as pkorg,mo.cState as 'poStatus'," +
                             "mo.cCode as 'poNum','SUBCONTRACTOR_PO' as 'poType','0085' as 'supplierNumber','森鑫' as 'supplierName'," +
-                            "ven.cVenPerson as 'supplierContacts',ven.cVenBranchPhone as 'supplierContactsPhone',mo.cPersonCode as 'headerAttributeString10',hr.cPsn_Num as 'headerAttributeString9'," +
-                            "hr1.cPsn_Name as 'salerCode',mo.cMaker as 'customerContacts','采购业务实体名称' as poBusinessUnitCode," +
+                            "ven.cVenPerson as 'supplierContacts',ven.cVenBranchPhone as 'supplierContactsPhone',mo.cPersonCode as 'salerCode',hr.cPsn_Num as 'headerAttributeString9'," +
+                            "hr1.cPsn_Name as 'headerAttributeString10',mo.cMaker as 'customerContacts','采购业务实体名称' as poBusinessUnitCode," +
                             "'' as 'customerContactsPhone','0.00' as 'totalAmount','0.00' as 'exTaxAmount', curr.cexch_code as 'currencyCode'," +
-                            "mo.iTaxRate as 'headerTaxRate',mo.dDate as 'customerDemandDate', mo.cMemo as 'remark'," +
-                            "'' as 'sourceDocNum',mo.cMaker as 'buyerCode',mo.dCreateTime  as 'publishDate',0 as 'tenantId'," +
+                            "mo.iTaxRate as 'headerTaxRate',mo.dDate as 'customerDemandDate', mo.cMemo as 'remark',mo.dVerifyDate as dVerifyDate," +
+                            "'' as 'sourceDocNum',mo.cMaker as 'customerContacts',mo.dCreateTime  as 'publishDate',0 as 'tenantId'," +
                             "0 as 'totalAmount','' as 'headerAttributeString1', mo.cCode as 'headerAttributeString2','' as 'headerAttributeString3'," +
                             "'' as 'headerAttributeString4'  from OM_MOMain mo left join Vendor ven on mo.cVenCode = ven.cVenCode " +
                             " left join (select cPsn_Num, cPsn_Name from hr_hi_person) hr " +
@@ -113,11 +118,11 @@ public class MOMainController implements ApplicationContextAware {
                 }else if(pkorgValue[0].equals("two")){
                     String sql = "select mo.MOID as 'moId',mo.MOID as 'moId','"+ac+"' as accId,'"+pkorgValue[0]+"' as pkorg,mo.cState as 'poStatus'," +
                             "mo.cCode as 'poNum','SUBCONTRACTOR_PO' as 'poType','0085' as 'supplierNumber','森鑫' as 'supplierName'," +
-                            "ven.cVenPerson as 'supplierContacts',ven.cVenBranchPhone as 'supplierContactsPhone',mo.cPersonCode as 'headerAttributeString10',hr.cPsn_Num as 'headerAttributeString9'," +
-                            "hr1.cPsn_Name as 'salerCode',mo.cMaker as 'customerContacts','采购业务实体名称' as poBusinessUnitCode," +
+                            "ven.cVenPerson as 'supplierContacts',ven.cVenBranchPhone as 'supplierContactsPhone',mo.cPersonCode as 'salerCode',hr.cPsn_Num as 'headerAttributeString9'," +
+                            "hr1.cPsn_Name as 'headerAttributeString10',mo.cMaker as 'customerContacts','采购业务实体名称' as poBusinessUnitCode," +
                             "'' as 'customerContactsPhone','0.00' as 'totalAmount','0.00' as 'exTaxAmount', curr.cexch_code as 'currencyCode'," +
-                            "mo.iTaxRate as 'headerTaxRate',mo.dDate as 'customerDemandDate', mo.cMemo as 'remark'," +
-                            "'' as 'sourceDocNum',mo.cMaker as 'buyerCode',mo.dCreateTime  as 'publishDate',0 as 'tenantId'," +
+                            "mo.iTaxRate as 'headerTaxRate',mo.dDate as 'customerDemandDate', mo.cMemo as 'remark',mo.dVerifyDate as dVerifyDate," +
+                            "'' as 'sourceDocNum',mo.cMaker as 'customerContacts',mo.dCreateTime  as 'publishDate',0 as 'tenantId'," +
                             "0 as 'totalAmount','' as 'headerAttributeString1', mo.cCode as 'headerAttributeString2','' as 'headerAttributeString3'," +
                             "'' as 'headerAttributeString4'  from OM_MOMain mo left join Vendor ven on mo.cVenCode = ven.cVenCode " +
                             " left join (select cPsn_Num, cPsn_Name from hr_hi_person) hr " +
@@ -135,11 +140,11 @@ public class MOMainController implements ApplicationContextAware {
                 }else if(pkorgValue[0].equals("three")){
                     String sql = "select mo.MOID as 'moId',mo.MOID as 'moId','"+ac+"' as accId,'"+pkorgValue[0]+"' as pkorg,mo.cState as 'poStatus'," +
                             "mo.cCode as 'poNum','SUBCONTRACTOR_PO' as 'poType','0085' as 'supplierNumber','森鑫' as 'supplierName'," +
-                            "ven.cVenPerson as 'supplierContacts',ven.cVenBranchPhone as 'supplierContactsPhone',mo.cPersonCode as 'headerAttributeString10',hr.cPsn_Num as 'headerAttributeString9'," +
-                            "hr1.cPsn_Name as 'salerCode',mo.cMaker as 'customerContacts','采购业务实体名称' as poBusinessUnitCode," +
+                            "ven.cVenPerson as 'supplierContacts',ven.cVenBranchPhone as 'supplierContactsPhone',mo.cPersonCode as 'salerCode',hr.cPsn_Num as 'headerAttributeString9'," +
+                            "hr1.cPsn_Name as 'headerAttributeString10',mo.cMaker as 'customerContacts','采购业务实体名称' as poBusinessUnitCode," +
                             "'' as 'customerContactsPhone','0.00' as 'totalAmount','0.00' as 'exTaxAmount', curr.cexch_code as 'currencyCode'," +
-                            "mo.iTaxRate as 'headerTaxRate',mo.dDate as 'customerDemandDate', mo.cMemo as 'remark'," +
-                            "'' as 'sourceDocNum',mo.cMaker as 'buyerCode',mo.dCreateTime  as 'publishDate',0 as 'tenantId'," +
+                            "mo.iTaxRate as 'headerTaxRate',mo.dDate as 'customerDemandDate', mo.cMemo as 'remark',mo.dVerifyDate as dVerifyDate," +
+                            "'' as 'sourceDocNum',mo.cMaker as 'customerContacts',mo.dCreateTime  as 'publishDate',0 as 'tenantId'," +
                             "0 as 'totalAmount','' as 'headerAttributeString1', mo.cCode as 'headerAttributeString2','' as 'headerAttributeString3'," +
                             "'' as 'headerAttributeString4'  from OM_MOMain mo left join Vendor ven on mo.cVenCode = ven.cVenCode " +
                             " left join (select cPsn_Num, cPsn_Name from hr_hi_person) hr " +
@@ -206,35 +211,54 @@ public class MOMainController implements ApplicationContextAware {
                             String accId = jo.getString("accId");
                             //订单类型
                             String type = jo.getString("type");
+                            //单据号
+                            String poNum = jo.getString("poNum");
+                            if(oConvertUtils.isEmpty(poNum)){
+                                poNum ="测试001";
+                            }
+                            //单据日期
+                            String date = jo.getString("date");
                             //账套666
                             if (accId.equals(yi)) {
                                 if(type.equals("SUBCONTRACTOR_PO")) {
-                                    if (code.equals("S")) {
-                                        String sql1 = "update OM_MOMain set cDefine10 = ? where MOID = ?";
-                                        senYuDataSourceOne.updateMOMain(sql1, "true，" + message, moId);
-                                    } else {
-                                        String sql1 = "update OM_MOMain set cDefine10 = ? where MOID = ?";
-                                        senYuDataSourceOne.updateMOMain(sql1, "false，" + message, moId);
+                                    if (code.equals("E")) {
+                                        //失败  新增失败汇总表
+                                        SyFailDocument syFailDocument = new SyFailDocument();
+                                        syFailDocument.setId(oConvertUtils.id());
+                                        syFailDocument.setDocumentType("委外订单");
+                                        syFailDocument.setDocumentNo(poNum);
+                                        syFailDocument.setDocumentDate(date);
+                                        syFailDocument.setDocumentStatus("0");
+                                        syFailDocument.setReason(message);
+                                        iSyFailDocumentService.save(syFailDocument);
                                     }
                                 }
                             }else if (accId.equals(er)) {
                                 if(type.equals("SUBCONTRACTOR_PO")) {
-                                    if (code.equals("S")) {
-                                        String sql1 = "update OM_MOMain set cDefine10 = ? where MOID = ?";
-                                        senYuDataSourceTwo.updateMOMain(sql1, "true，" + message, moId);
-                                    } else {
-                                        String sql1 = "update OM_MOMain set cDefine10 = ? where MOID = ?";
-                                        senYuDataSourceTwo.updateMOMain(sql1, "false，" + message, moId);
+                                    if (code.equals("E")) {
+                                        //失败  新增失败汇总表
+                                        SyFailDocument syFailDocument = new SyFailDocument();
+                                        syFailDocument.setId(oConvertUtils.id());
+                                        syFailDocument.setDocumentType("委外订单");
+                                        syFailDocument.setDocumentNo(poNum);
+                                        syFailDocument.setDocumentDate(date);
+                                        syFailDocument.setDocumentStatus("0");
+                                        syFailDocument.setReason(message);
+                                        iSyFailDocumentService.save(syFailDocument);
                                     }
                                 }
                             }else if (accId.equals(san)) {
                                 if(type.equals("SUBCONTRACTOR_PO")) {
-                                    if (code.equals("S")) {
-                                        String sql1 = "update OM_MOMain set cDefine10 = ? where MOID = ?";
-                                        iSenYuDataSourceThree.updateMOMain(sql1, "true，" + message, moId);
-                                    } else {
-                                        String sql1 = "update OM_MOMain set cDefine10 = ? where MOID = ?";
-                                        iSenYuDataSourceThree.updateMOMain(sql1, "false，" + message, moId);
+                                    if (code.equals("E")) {
+                                        //失败  新增失败汇总表
+                                        SyFailDocument syFailDocument = new SyFailDocument();
+                                        syFailDocument.setId(oConvertUtils.id());
+                                        syFailDocument.setDocumentType("委外订单");
+                                        syFailDocument.setDocumentNo(poNum);
+                                        syFailDocument.setDocumentDate(date);
+                                        syFailDocument.setDocumentStatus("0");
+                                        syFailDocument.setReason(message);
+                                        iSyFailDocumentService.save(syFailDocument);
                                     }
                                 }
                             }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/openApi/controller/POPomainController.java

@@ -10,6 +10,9 @@ import com.google.gson.GsonBuilder;
 import lombok.extern.log4j.Log4j;
 import lombok.extern.log4j.Log4j2;
 import org.apache.commons.lang.StringEscapeUtils;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.documents.failDocument.entity.SyFailDocument;
+import org.jeecg.modules.documents.failDocument.service.ISyFailDocumentService;
 import org.jeecg.modules.openApi.entity.DxpDataPlan;
 import org.jeecg.modules.openApi.service.IDxpDataPlanService;
 import org.jeecg.modules.openApi.service.ISenYuDataSourceOne;
@@ -18,6 +21,7 @@ import org.jeecg.modules.openApi.service.ISenYuDataSourceTwo;
 import org.jeecg.modules.system.util.InterfaceConnUtils;
 import org.jeecg.modules.system.util.JsonChangeUtils;
 import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.stereotype.Component;
@@ -43,6 +47,8 @@ public class POPomainController implements ApplicationContextAware {
     private static ISenYuDataSourceTwo senYuDataSourceTwo;
     //数据源one
     private static ISenYuDataSourceThree iSenYuDataSourceThree;
+    @Autowired
+    private ISyFailDocumentService iSyFailDocumentService;
 
 
     @PostMapping(value = "/QueryPoMain")
@@ -84,12 +90,12 @@ public class POPomainController implements ApplicationContextAware {
                     //ven.cVenName，mo.cVenCode mo.cPersonCode as salerId,hr.cPsn_Num as 'buyerId',
                     //cAuditTime>'"+lasttimeSf+"' and mo.iverifystateex = 2
                     String sql = "select mo.POID as 'moId','"+ac+"' as accId,'"+pkorgValue[0]+"' as pkorg,mo.cState as 'poStatus',mo.cPOID as 'poNum','STANDARD_PO' as 'poType'," +
-                            "'0085' as 'supplierNumber','采购业务实体名称' as 'poBusinessUnitCode','森鑫' as 'supplierName',mo.cPersonCode as headerAttributeString10,hr.cPsn_Num as 'headerAttributeString9'," +
+                            "'0085' as 'supplierNumber','采购业务实体名称' as 'poBusinessUnitCode','森鑫' as 'supplierName',mo.cPersonCode as salerCode,hr.cPsn_Num as 'headerAttributeString9'," +
                             "ven.cVenPerson as 'supplierContacts',ven.cVenBranchPhone as 'supplierContactsPhone'," +
                             "mo.cPOID as headerAttributeString2,'' as 'customerContactsPhone','0.00' as 'totalAmount'," +
                             "'0.00' as 'exTaxAmount', curr.cexch_code as 'currencyCode',mo.iTaxRate as 'headerTaxRate'," +
                             "mo.dPODate as 'customerDemandDate', mo.cMemo as 'remark','' as 'sourceDocNum'," +
-                            "mo.cMaker as 'buyerCode',hr1.cPsn_Name as salerCode," +
+                            "mo.cMaker as 'customerContacts',hr1.cPsn_Name as headerAttributeString10,mo.cAuditDate as cAuditDate," +
                             " mo.cmaketime  as 'publishDate'  from PO_Pomain mo left join Vendor ven on mo.cVenCode = ven.cVenCode " +
                             "left join (select cPsn_Num, cPsn_Name from hr_hi_person) hr " +
                             "on mo.cMaker = hr.cPsn_Name " +
@@ -106,12 +112,12 @@ public class POPomainController implements ApplicationContextAware {
                 }
                 else if(pkorgValue[0].equals("two")){
                     String sql = "select mo.POID as 'moId','"+ac+"' as accId,'"+pkorgValue[0]+"' as pkorg,mo.cState as 'poStatus',mo.cPOID as 'poNum','STANDARD_PO' as 'poType'," +
-                            "'0085' as 'supplierNumber','采购业务实体名称' as 'poBusinessUnitCode','森鑫' as 'supplierName',mo.cPersonCode as headerAttributeString10,hr.cPsn_Num as 'headerAttributeString9'," +
+                            "'0085' as 'supplierNumber','采购业务实体名称' as 'poBusinessUnitCode','森鑫' as 'supplierName',mo.cPersonCode as salerCode,hr.cPsn_Num as 'headerAttributeString9'," +
                             "ven.cVenPerson as 'supplierContacts',ven.cVenBranchPhone as 'supplierContactsPhone'," +
                             "mo.cPOID as headerAttributeString2,'' as 'customerContactsPhone','0.00' as 'totalAmount'," +
                             "'0.00' as 'exTaxAmount', curr.cexch_code as 'currencyCode',mo.iTaxRate as 'headerTaxRate'," +
                             "mo.dPODate as 'customerDemandDate',mo.cMemo as 'remark','' as 'sourceDocNum'," +
-                            "mo.cMaker as 'buyerCode',hr1.cPsn_Name as salerCode," +
+                            "mo.cMaker as 'customerContacts',hr1.cPsn_Name as headerAttributeString10,mo.cAuditDate as cAuditDate," +
                             " mo.cmaketime  as 'publishDate'  from PO_Pomain mo left join Vendor ven on mo.cVenCode = ven.cVenCode " +
                             "left join (select cPsn_Num, cPsn_Name from hr_hi_person) hr " +
                             "on mo.cMaker = hr.cPsn_Name " +
@@ -127,12 +133,12 @@ public class POPomainController implements ApplicationContextAware {
 //hr.cPsn_Num as 'buyerId',mo.cPersonCode as salerId,
                 }else if(pkorgValue[0].equals("three")){
                     String sql = "select mo.POID as 'moId','"+ac+"' as accId,'"+pkorgValue[0]+"' as pkorg,mo.cState as 'poStatus',mo.cPOID as 'poNum','STANDARD_PO' as 'poType'," +
-                            "'0085' as 'supplierNumber','采购业务实体名称' as 'poBusinessUnitCode','森鑫' as 'supplierName',mo.cPersonCode as headerAttributeString10,hr.cPsn_Num as 'headerAttributeString9'," +
+                            "'0085' as 'supplierNumber','采购业务实体名称' as 'poBusinessUnitCode','森鑫' as 'supplierName',mo.cPersonCode as salerCode,hr.cPsn_Num as 'headerAttributeString9'," +
                             "ven.cVenPerson as 'supplierContacts',ven.cVenBranchPhone as 'supplierContactsPhone'," +
                             "mo.cPOID as headerAttributeString2,'' as 'customerContactsPhone','0.00' as 'totalAmount'," +
                             "'0.00' as 'exTaxAmount', curr.cexch_code as 'currencyCode',mo.iTaxRate as 'headerTaxRate'," +
                             "mo.dPODate as 'customerDemandDate', mo.cMemo as 'remark','' as 'sourceDocNum'," +
-                            "mo.cMaker as 'buyerCode',hr1.cPsn_Name as salerCode," +
+                            "mo.cMaker as 'customerContacts',hr1.cPsn_Name as headerAttributeString10,mo.cAuditDate as cAuditDate," +
                             " mo.cmaketime  as 'publishDate'  from PO_Pomain mo left join Vendor ven on mo.cVenCode = ven.cVenCode " +
                             "left join (select cPsn_Num, cPsn_Name from hr_hi_person) hr " +
                             "on mo.cMaker = hr.cPsn_Name " +
@@ -203,41 +209,54 @@ public class POPomainController implements ApplicationContextAware {
                             String accId = jo.getString("accId");
                             //订单类型
                             String type = jo.getString("type");
+                            //单据号
+                            String poNum = jo.getString("poNum");
+                            if(oConvertUtils.isEmpty(poNum)){
+                                poNum ="测试001";
+                            }
+                            //单据日期
+                            String date = jo.getString("date");
                             //账套1
                             if (accId.equals(yi)) {
                                 if(type.equals("STANDARD_PO")){
-                                    if (code.equals("S")) {
-                                        //普通采购回写
-                                        String sql = "update PO_Pomain set cDefine10 = ? where POID = ?";
-                                        senYuDataSourceOne.updatePOMain(sql, "true，" + message, moId);
-                                    } else {
-                                        //普通采购回写
-                                        String sql = "update PO_Pomain set cDefine10 = ? where POID = ?";
-                                        senYuDataSourceOne.updatePOMain(sql, "false，" + message, moId);
+                                    if (code.equals("E")) {
+                                       //失败  新增失败汇总表
+                                        SyFailDocument syFailDocument = new SyFailDocument();
+                                        syFailDocument.setId(oConvertUtils.id());
+                                        syFailDocument.setDocumentType("采购订单");
+                                        syFailDocument.setDocumentNo(poNum);
+                                        syFailDocument.setDocumentDate(date);
+                                        syFailDocument.setDocumentStatus("0");
+                                        syFailDocument.setReason(message);
+                                        iSyFailDocumentService.save(syFailDocument);
                                     }
                                 }
                             }else if(accId.equals(er)){
                                 if(type.equals("STANDARD_PO")) {
-                                    if (code.equals("S")) {
-                                        //普通采购回写
-                                        String sql = "update PO_Pomain set cDefine10 = ? where POID = ?";
-                                        senYuDataSourceTwo.updatePOMain(sql, "true，" + message, moId);
-                                    } else {
-                                        //普通采购回写
-                                        String sql = "update PO_Pomain set cDefine10 = ? where POID = ?";
-                                        senYuDataSourceTwo.updatePOMain(sql, "false，" + message, moId);
+                                    if (code.equals("E")) {
+                                        //失败  新增失败汇总表
+                                        SyFailDocument syFailDocument = new SyFailDocument();
+                                        syFailDocument.setId(oConvertUtils.id());
+                                        syFailDocument.setDocumentType("采购订单");
+                                        syFailDocument.setDocumentNo(poNum);
+                                        syFailDocument.setDocumentDate(date);
+                                        syFailDocument.setDocumentStatus("0");
+                                        syFailDocument.setReason(message);
+                                        iSyFailDocumentService.save(syFailDocument);
                                     }
                                 }
                             }else if(accId.equals(san)) {
                                 if(type.equals("STANDARD_PO")) {
-                                    if (code.equals("S")) {
-                                        //普通采购回写
-                                        String sql = "update PO_Pomain set cDefine10 = ? where POID = ?";
-                                        iSenYuDataSourceThree.updatePOMain(sql, "true，" + message, moId);
-                                    } else {
-                                        //普通采购回写
-                                        String sql = "update PO_Pomain set cDefine10 = ? where POID = ?";
-                                        iSenYuDataSourceThree.updatePOMain(sql, "false，" + message, moId);
+                                    if (code.equals("E")) {
+                                        //失败  新增失败汇总表
+                                        SyFailDocument syFailDocument = new SyFailDocument();
+                                        syFailDocument.setId(oConvertUtils.id());
+                                        syFailDocument.setDocumentType("采购订单");
+                                        syFailDocument.setDocumentNo(poNum);
+                                        syFailDocument.setDocumentDate(date);
+                                        syFailDocument.setDocumentStatus("0");
+                                        syFailDocument.setReason(message);
+                                        iSyFailDocumentService.save(syFailDocument);
                                     }
                                 }
                             }
@@ -263,4 +282,5 @@ public class POPomainController implements ApplicationContextAware {
         this.senYuDataSourceTwo = applicationContext.getBean(ISenYuDataSourceTwo.class);
         this.iSenYuDataSourceThree = applicationContext.getBean(ISenYuDataSourceThree.class);
     }
+
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/openApi/controller/RdrecordController.java

@@ -141,17 +141,17 @@ public class RdrecordController implements ApplicationContextAware {
                     String busSplit[] = businessCode.split("#");
                     //账套666
                     if (busSplit[1].equals(yi)) {
-                        if (code.equals("S")) {
-                            //普通采购回写
-                            String sql = "update rdrecord11 set cDefine10 = ? where cPOID = ?";
-                            senYuDataSourceOne.updateRdrecord(sql, "true，" + message, busSplit[0]);
-
-                        } else {
-                            //普通采购回写
-                            String sql = "update rdrecord11 set cDefine10 = ? where cPOID = ?";
-                            senYuDataSourceOne.updateRdrecord(sql, "false," + message, busSplit[0]);
-
-                        }
+//                        if (code.equals("S")) {
+//                            //普通采购回写
+//                            String sql = "update rdrecord11 set cDefine10 = ? where cPOID = ?";
+//                            senYuDataSourceOne.updateRdrecord(sql, "true，" + message, busSplit[0]);
+//
+//                        } else {
+//                            //普通采购回写
+//                            String sql = "update rdrecord11 set cDefine10 = ? where cPOID = ?";
+//                            senYuDataSourceOne.updateRdrecord(sql, "false," + message, busSplit[0]);
+//
+//                        }
                     }
                     //账套012
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/openApi/service/ISenYuDataSourceOne.java

@@ -13,13 +13,4 @@ public interface ISenYuDataSourceOne {
 
     public boolean update(String sql);//执行更新或删除语句
 
-    //修改采购订单是否同步成功！
-    public boolean updateMOMain(String sql,String cDefine10,String moId);
-
-    //修改委外订单是否同步成功！
-    public boolean updatePOMain(String sql,String cDefine10,String moId);
-
-    //修改材料出库单是否同步成功！
-    public boolean updateRdrecord(String sql,String cDefine10,String id);
-
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/openApi/service/ISenYuDataSourceThree.java

@@ -14,12 +14,5 @@ public interface ISenYuDataSourceThree {
 
     public boolean update(String sql);//执行更新或删除语句
 
-    //修改采购订单是否同步成功！
-    public boolean updateMOMain(String sql,String cDefine10,String moId);
 
-    //修改委外订单是否同步成功！
-    public boolean updatePOMain(String sql,String cDefine10,String moId);
-
-    //修改材料出库单是否同步成功！
-    public boolean updateRdrecord(String sql,String cDefine10,String id);
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/openApi/service/ISenYuDataSourceTwo.java

@@ -14,12 +14,5 @@ public interface ISenYuDataSourceTwo {
 
     public boolean update(String sql);//执行更新或删除语句
 
-    //修改采购订单是否同步成功！
-    public boolean updateMOMain(String sql,String cDefine10,String moId);
 
-    //修改委外订单是否同步成功！
-    public boolean updatePOMain(String sql,String cDefine10,String moId);
-
-    //修改材料出库单是否同步成功！
-    public boolean updateRdrecord(String sql,String cDefine10,String id);
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/openApi/service/impl/SenYuDataSourceOneServiceImpl.java

@@ -2,6 +2,8 @@ package org.jeecg.modules.openApi.service.impl;
 
 
 import com.baomidou.dynamic.datasource.annotation.DS;
+import org.jeecg.modules.documents.failDocument.entity.SyFailDocument;
+import org.jeecg.modules.documents.failDocument.service.ISyFailDocumentService;
 import org.jeecg.modules.openApi.service.ISenYuDataSourceOne;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;
@@ -16,6 +18,8 @@ public class SenYuDataSourceOneServiceImpl implements ISenYuDataSourceOne {
 
     @Autowired
     private JdbcTemplate jdbcTemplate;
+    @Autowired
+    private ISyFailDocumentService failDocumentService;
 
     @Override
     public List<Map<String, Object>> queryForList(String sql) {
@@ -32,74 +36,5 @@ public class SenYuDataSourceOneServiceImpl implements ISenYuDataSourceOne {
         return flag;
     }
 
-    /**
-     * 修改委外订单是否同步成功
-     * @param sql
-     * @param cDefine10
-     * @param moId
-     * @return
-     */
-    @Override
-    public boolean updateMOMain(String sql, String cDefine10, String moId) {
-        // 定义返回结果
-        boolean flag = false;
-        try {
-            int i = jdbcTemplate.update(sql, cDefine10, moId);
-            if (i > 0) {
-                flag = true;
-            }
-
-        } catch (Exception exception) {
-            exception.printStackTrace();
-        }
-        return flag;
-    }
-
-
-    /**
-     * 修改采购订单是否同步成功
-     * @param sql
-     * @param cDefine10
-     * @param moId
-     * @return
-     */
-    @Override
-    public boolean updatePOMain(String sql, String cDefine10, String moId) {
-        // 定义返回结果
-        boolean flag = false;
-        try {
-            int i = jdbcTemplate.update(sql, cDefine10, moId);
-            if (i > 0) {
-                flag = true;
-            }
-
-        } catch (Exception exception) {
-            exception.printStackTrace();
-        }
-        return flag;
-    }
-
-    /**
-     * 修改材料出库单是否同步成功！
-     * @param sql
-     * @param cDefine10
-     * @param id
-     * @return
-     */
-    @Override
-    public boolean updateRdrecord(String sql, String cDefine10, String id) {
-        // 定义返回结果
-        boolean flag = false;
-        try {
-            int i = jdbcTemplate.update(sql, cDefine10, id);
-            if (i > 0) {
-                flag = true;
-            }
-
-        } catch (Exception exception) {
-            exception.printStackTrace();
-        }
-        return flag;
-    }
 
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/openApi/service/impl/SenYuDataSourceThreeServiceImpl.java

@@ -33,74 +33,5 @@ public class SenYuDataSourceThreeServiceImpl implements ISenYuDataSourceThree {
         return flag;
     }
 
-    /**
-     * 修改委外订单是否同步成功
-     * @param sql
-     * @param cDefine10
-     * @param moId
-     * @return
-     */
-    @Override
-    public boolean updateMOMain(String sql, String cDefine10, String moId) {
-        // 定义返回结果
-        boolean flag = false;
-        try {
-            int i = jdbcTemplate.update(sql, cDefine10, moId);
-            if (i > 0) {
-                flag = true;
-            }
-
-        } catch (Exception exception) {
-            exception.printStackTrace();
-        }
-        return flag;
-    }
-
-
-    /**
-     * 修改采购订单是否同步成功
-     * @param sql
-     * @param cDefine10
-     * @param moId
-     * @return
-     */
-    @Override
-    public boolean updatePOMain(String sql, String cDefine10, String moId) {
-        // 定义返回结果
-        boolean flag = false;
-        try {
-            int i = jdbcTemplate.update(sql, cDefine10, moId);
-            if (i > 0) {
-                flag = true;
-            }
-
-        } catch (Exception exception) {
-            exception.printStackTrace();
-        }
-        return flag;
-    }
-
-    /**
-     * 修改材料出库单是否同步成功！
-     * @param sql
-     * @param cDefine10
-     * @param id
-     * @return
-     */
-    @Override
-    public boolean updateRdrecord(String sql, String cDefine10, String id) {
-        // 定义返回结果
-        boolean flag = false;
-        try {
-            int i = jdbcTemplate.update(sql, cDefine10, id);
-            if (i > 0) {
-                flag = true;
-            }
-
-        } catch (Exception exception) {
-            exception.printStackTrace();
-        }
-        return flag;
-    }
 
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/openApi/service/impl/SenYuDataSourceTwoServiceImpl.java

@@ -32,74 +32,5 @@ public class SenYuDataSourceTwoServiceImpl implements ISenYuDataSourceTwo {
         return flag;
     }
 
-    /**
-     * 修改委外订单是否同步成功
-     * @param sql
-     * @param cDefine10
-     * @param moId
-     * @return
-     */
-    @Override
-    public boolean updateMOMain(String sql, String cDefine10, String moId) {
-        // 定义返回结果
-        boolean flag = false;
-        try {
-            int i = jdbcTemplate.update(sql, cDefine10, moId);
-            if (i > 0) {
-                flag = true;
-            }
-
-        } catch (Exception exception) {
-            exception.printStackTrace();
-        }
-        return flag;
-    }
-
-
-    /**
-     * 修改采购订单是否同步成功
-     * @param sql
-     * @param cDefine10
-     * @param moId
-     * @return
-     */
-    @Override
-    public boolean updatePOMain(String sql, String cDefine10, String moId) {
-        // 定义返回结果
-        boolean flag = false;
-        try {
-            int i = jdbcTemplate.update(sql, cDefine10, moId);
-            if (i > 0) {
-                flag = true;
-            }
-
-        } catch (Exception exception) {
-            exception.printStackTrace();
-        }
-        return flag;
-    }
-
-    /**
-     * 修改材料出库单是否同步成功！
-     * @param sql
-     * @param cDefine10
-     * @param id
-     * @return
-     */
-    @Override
-    public boolean updateRdrecord(String sql, String cDefine10, String id) {
-        // 定义返回结果
-        boolean flag = false;
-        try {
-            int i = jdbcTemplate.update(sql, cDefine10, id);
-            if (i > 0) {
-                flag = true;
-            }
-
-        } catch (Exception exception) {
-            exception.printStackTrace();
-        }
-        return flag;
-    }
 
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/util/JsonChangeUtils.java

@@ -72,7 +72,7 @@ public class JsonChangeUtils implements ApplicationContextAware{
                         "mo.iTaxPrice as 'customerPrice',(mo.iPerTaxRate/100) as 'lineTaxRate',mo.iSum as 'amount'," +
                         "mo.cDefine28 as 'lineAttributeString1',mo.cDefine32 as 'lineAttributeString2',mo.cDefine29 as 'lineAttributeString3'," +
                         "mo.cDefine30 as 'lineAttributeString4',mo.cbMemo as 'lineAttributeString5',mo.cDefine22 as lineAttributeString6,'' as lineAttributeString7,'' as lineAttributeString8," +
-                        "cFree1 as 'color','' as 'customerNumber'," +
+                        "cFree1 as 'color','' as 'customerNumber',mo.iUnitPrice as supplierExTaxPrice,'"+map.get("dVerifyDate")+"' as lineAttributeString9," +
                         "'' as externalLineNum,'' as itemAttrId,'"+map.get("moId")+"' as poId  from OM_MODetails mo  " +
                         "left join Inventory inv  on mo.cInvCode = inv.cInvCode"+
                         " where mo.MOID = "+map.get("moId");
@@ -98,7 +98,7 @@ public class JsonChangeUtils implements ApplicationContextAware{
                         "mo.iTaxPrice as 'customerPrice',(mo.iPerTaxRate/100) as 'lineTaxRate',mo.iSum as 'amount'," +
                         "mo.cDefine28 as 'lineAttributeString1',mo.cDefine32 as 'lineAttributeString2',mo.cDefine29 as 'lineAttributeString3'," +
                         "mo.cDefine30 as 'lineAttributeString4',mo.cbMemo as 'lineAttributeString5',mo.cDefine22 as lineAttributeString6,'' as lineAttributeString7,'' as lineAttributeString8," +
-                        "cFree1 as 'color','' as 'customerNumber'," +
+                        "cFree1 as 'color','' as 'customerNumber',mo.iUnitPrice as supplierExTaxPrice,'"+map.get("dVerifyDate")+"' as lineAttributeString9," +
                         "'' as externalLineNum,'' as itemAttrId,'"+map.get("moId")+"' as poId  from OM_MODetails mo  " +
                         "left join Inventory inv  on mo.cInvCode = inv.cInvCode"+
                         " where mo.MOID = "+map.get("moId");
@@ -124,7 +124,7 @@ public class JsonChangeUtils implements ApplicationContextAware{
                         "mo.iTaxPrice as 'customerPrice',(mo.iPerTaxRate/100) as 'lineTaxRate',mo.iSum as 'amount'," +
                         "mo.cDefine28 as 'lineAttributeString1',mo.cDefine32 as 'lineAttributeString2',mo.cDefine29 as 'lineAttributeString3'," +
                         "mo.cDefine30 as 'lineAttributeString4',mo.cbMemo as 'lineAttributeString5',mo.cDefine22 as lineAttributeString6,'' as lineAttributeString7,'' as lineAttributeString8," +
-                        "cFree1 as 'color','' as 'customerNumber'," +
+                        "cFree1 as 'color','' as 'customerNumber',mo.iUnitPrice as supplierExTaxPrice,'"+map.get("dVerifyDate")+"' as lineAttributeString9," +
                         "'' as externalLineNum,'' as itemAttrId,'"+map.get("moId")+"' as poId  from OM_MODetails mo  " +
                         "left join Inventory inv  on mo.cInvCode = inv.cInvCode"+
                         " where mo.MOID = "+map.get("moId");
@@ -183,7 +183,7 @@ public class JsonChangeUtils implements ApplicationContextAware{
                         "mo.cInvCode as 'customerItemCode',inv.cInvName as 'itemName','' as 'poLineStatus',mo.dArriveDate as 'supplierPromiseDate'," +
                         "'' as receivingInventoryOrgCode,mo.cFree1 as cFree1,mo.cFree2 as cFree2,mo.cFree3 as cFree3,mo.cFree4 as cFree4," +
                         "mo.cFree5 as cFree5,mo.cFree6 as cFree6,mo.cFree7 as cFree7,mo.cFree8 as cFree8,mo.cFree9 as cFree9,mo.cFree10 as cFree10,mo.iQuantity as 'customerDemandQty',mo.cUnitID as 'customerUomCode'," +
-                        "'"+map.get("customerDemandDate")+"' as 'customerDemandDate',mo.iMoney as 'iMoney'," +
+                        "'"+map.get("customerDemandDate")+"' as 'customerDemandDate',mo.iMoney as 'iMoney',mo.iUnitPrice as supplierExTaxPrice,'"+map.get("cAuditDate")+"' as lineAttributeString9," +
                         "mo.iTaxPrice as 'customerPrice',(mo.iPerTaxRate/100) as 'lineTaxRate',mo.iSum as 'amount',mo.cDefine28 as 'lineAttributeString1'," +
                         "mo.cDefine32 as 'lineAttributeString2',mo.cDefine29 as 'lineAttributeString3','' as 'attributeString1',mo.cDefine30 as 'lineAttributeString4'," +
                         "mo.cbMemo as 'lineAttributeString5',mo.cDefine22 as lineAttributeString6,'' as lineAttributeString7,'' as lineAttributeString8,'' as 'color'," +
@@ -207,7 +207,7 @@ public class JsonChangeUtils implements ApplicationContextAware{
                         "mo.cInvCode as 'customerItemCode',inv.cInvName as 'itemName','' as 'poLineStatus',mo.dArriveDate as 'supplierPromiseDate'," +
                         "'' as receivingInventoryOrgCode,mo.cFree1 as cFree1,mo.cFree2 as cFree2,mo.cFree3 as cFree3,mo.cFree4 as cFree4," +
                         "mo.cFree5 as cFree5,mo.cFree6 as cFree6,mo.cFree7 as cFree7,mo.cFree8 as cFree8,mo.cFree9 as cFree9,mo.cFree10 as cFree10,mo.iQuantity as 'customerDemandQty',mo.cUnitID as 'customerUomCode'," +
-                        "'"+map.get("customerDemandDate")+"' as 'customerDemandDate',mo.iMoney as 'iMoney'," +
+                        "'"+map.get("customerDemandDate")+"' as 'customerDemandDate',mo.iMoney as 'iMoney',mo.iUnitPrice as supplierExTaxPrice,'"+map.get("cAuditDate")+"' as lineAttributeString9," +
                         "mo.iTaxPrice as 'customerPrice',(mo.iPerTaxRate/100) as 'lineTaxRate',mo.iSum as 'amount',mo.cDefine28 as 'lineAttributeString1'," +
                         "mo.cDefine32 as 'lineAttributeString2',mo.cDefine29 as 'lineAttributeString3','' as 'attributeString1',mo.cDefine30 as 'lineAttributeString4'," +
                         "mo.cbMemo as 'lineAttributeString5',mo.cDefine22 as lineAttributeString6,'' as lineAttributeString7,'' as lineAttributeString8,'' as 'color'," +
@@ -230,7 +230,7 @@ public class JsonChangeUtils implements ApplicationContextAware{
                         "mo.cInvCode as 'customerItemCode',inv.cInvName as 'itemName','' as 'poLineStatus',mo.dArriveDate as 'supplierPromiseDate'," +
                         "'' as receivingInventoryOrgCode,mo.cFree1 as cFree1,mo.cFree2 as cFree2,mo.cFree3 as cFree3,mo.cFree4 as cFree4," +
                         "mo.cFree5 as cFree5,mo.cFree6 as cFree6,mo.cFree7 as cFree7,mo.cFree8 as cFree8,mo.cFree9 as cFree9,mo.cFree10 as cFree10,mo.iQuantity as 'customerDemandQty',mo.cUnitID as 'customerUomCode'," +
-                        "'"+map.get("customerDemandDate")+"' as 'customerDemandDate',mo.iMoney as 'iMoney'," +
+                        "'"+map.get("customerDemandDate")+"' as 'customerDemandDate',mo.iMoney as 'iMoney',mo.iUnitPrice as supplierExTaxPrice,'"+map.get("cAuditDate")+"' as lineAttributeString9," +
                         "mo.iTaxPrice as 'customerPrice',(mo.iPerTaxRate/100) as 'lineTaxRate',mo.iSum as 'amount',mo.cDefine28 as 'lineAttributeString1'," +
                         "mo.cDefine32 as 'lineAttributeString2',mo.cDefine29 as 'lineAttributeString3','' as 'attributeString1',mo.cDefine30 as 'lineAttributeString4'," +
                         "mo.cbMemo as 'lineAttributeString5',mo.cDefine22 as lineAttributeString6,'' as lineAttributeString7,'' as lineAttributeString8,'' as 'color'," +