2.2.0

ERP：完善同步物料信息接口、同步供应商信息接口、同步销售订单信息接口、同步采购订单信息接口、同步项目信息接口

hw-api/hw-api-jindie/src/main/java/com/hw/jindie/api/RemoteJindieService.java

@@ -5,9 +5,8 @@ import com.hw.common.core.constant.ServiceNameConstants;
 import com.hw.common.core.domain.R;
 import com.hw.jindie.api.factory.RemoteJindieFallbackFactory;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestHeader;
-import org.springframework.web.bind.annotation.RequestParam;
 
 /**
  * @ClassName : RemoteJindieService
@@ -19,10 +18,23 @@ import org.springframework.web.bind.annotation.RequestParam;
 public interface RemoteJindieService {
 
     /** 同步供应商*/
-    @GetMapping("/jindie/ErpSupplierInfo")
-    R<Integer> ErpSupplierInfo(@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+    @PostMapping("/jindie/syncSupplierInfoFromErp")
+    R<Integer> syncSupplierInfoFromErp(@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 
     /** 同步物料*/
-    @GetMapping("/jindie/syncMaterialInfo")
-    R<Integer> ErpMesMaterialInfo(@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+    @PostMapping("/jindie/syncMaterialInfoFromErp")
+    R<Integer> syncMaterialInfoFromErp(@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+    /** 同步项目信息*/
+    @PostMapping("/jindie/syncProjectInfoFromErp")
+    R<Integer> syncProjectInfoFromErp(@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+    /** 同步销售订单*/
+    @PostMapping("/jindie/syncSaleOrderFromErp")
+    R<Integer> syncSaleOrderFromErp(@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+    /** 同步采购订单*/
+    @PostMapping("/jindie/syncPurchaseOrderFromErp")
+    R<Integer> syncPurchaseOrderFromErp(@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
 }

hw-api/hw-api-jindie/src/main/java/com/hw/jindie/api/factory/RemoteJindieFallbackFactory.java

@@ -14,13 +14,28 @@ public class RemoteJindieFallbackFactory implements FallbackFactory<RemoteJindie
     public RemoteJindieService create(Throwable throwable) {
         return new RemoteJindieService() {
             @Override
-            public R<Integer> ErpSupplierInfo(String source) {
-                return null;
+            public R<Integer> syncSupplierInfoFromErp(String source) {
+                return R.fail("同步供应商信息失败:" + throwable.getMessage());
             }
 
             @Override
-            public R<Integer> ErpMesMaterialInfo(String source) {
-                return null;
+            public R<Integer> syncMaterialInfoFromErp(String source) {
+                return R.fail("同步物料信息失败:" + throwable.getMessage());
+            }
+
+            @Override
+            public R<Integer> syncProjectInfoFromErp(String source) {
+                return R.fail("同步项目信息失败:" + throwable.getMessage());
+            }
+
+            @Override
+            public R<Integer> syncSaleOrderFromErp(String source) {
+                return R.fail("同步销售订单信息失败:" + throwable.getMessage());
+            }
+
+            @Override
+            public R<Integer> syncPurchaseOrderFromErp(String source) {
+                return R.fail("同步采购订单信息失败:" + throwable.getMessage());
             }
         };
     }

hw-modules/hw-jindie/src/main/java/com/hw/jindie/controller/KingdeeErpSyncController.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson2.JSONObject;
 import com.hw.common.core.web.domain.AjaxResult;
 import com.hw.common.log.annotation.Log;
 import com.hw.common.log.enums.BusinessType;
+import com.hw.common.security.annotation.InnerAuth;
 import com.hw.jindie.service.IKingdeeErpSyncService;
 import com.hw.jindie.service.impl.KingdeeErpService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,10 +28,12 @@ public class KingdeeErpSyncController {
     private KingdeeErpService kingdeeErpService;
 
     /**
-     * 同步erp中供应商数据
+     * 从erp中同步供应商数据到MES
      * */
-    @GetMapping("/ErpSupplierInfo")
-    public AjaxResult ErpSupplierInfo(){
+    @PostMapping("/syncSupplierInfoFromErp")
+    @Log(title = "ERP供应商信息", businessType = BusinessType.INSERT)
+    @InnerAuth
+    public AjaxResult syncSupplierInfoFromErp(){
         try {
             return AjaxResult.success(kingdeeErpSyncService.syncSupplierInfoFromErp(0));
         } catch (Exception e){
@@ -40,12 +43,13 @@ public class KingdeeErpSyncController {
     }
 
     /**
-     * 新增原材料入库记录
+     * 从ERP中同步物料信息到MES
      */
 //    @RequiresPermissions("wms:mobile:addrawinstock")
-    @Log(title = "物料信息", businessType = BusinessType.INSERT)
-    @GetMapping(("/syncMaterialInfo"))
-    public AjaxResult syncMaterialInfo() {
+    @Log(title = "ERP物料信息", businessType = BusinessType.INSERT)
+    @PostMapping(("/syncMaterialInfoFromErp"))
+    @InnerAuth
+    public AjaxResult syncMaterialInfoFromErp() {
         try {
             return AjaxResult.success(kingdeeErpSyncService.syncMaterialInfoFromErp(0));
         } catch (Exception e) {
@@ -55,6 +59,61 @@ public class KingdeeErpSyncController {
 
     }
 
+
+
+    /**
+     * 从ERP中同步项目信息到MES
+     * */
+    @PostMapping("/syncProjectInfoFromErp")
+    @Log(title = "ERP项目信息", businessType = BusinessType.INSERT)
+    @InnerAuth
+    public AjaxResult syncProjectInfoFromErp(){
+        try {
+            return AjaxResult.success(kingdeeErpSyncService.syncProjectInfoFromErp(0));
+        }
+        catch (Exception e) {
+            return AjaxResult.error();
+        }
+    }
+
+    /**
+     * 从ERP中同步销售订单信息到ERP
+     * */
+    @PostMapping("/syncSaleOrderFromErp")
+    @Log(title = "ERP销售订单", businessType = BusinessType.INSERT)
+    @InnerAuth
+    public AjaxResult syncSaleOrderFromErp(){
+        try {
+            return AjaxResult.success(kingdeeErpSyncService.syncSaleOrderFromErp(0));
+        }
+        catch (Exception e) {
+            e.printStackTrace();
+            return AjaxResult.error();
+        }
+    }
+
+
+    /**
+     * 从ERP中同步采购订单信息到MES
+     * */
+    @PostMapping("/syncPurchaseOrderFromErp")
+    @Log(title = "ERP采购订单", businessType = BusinessType.INSERT)
+    @InnerAuth
+    public AjaxResult syncPurchaseOrderFromErp(){
+        try {
+            return AjaxResult.success(kingdeeErpSyncService.syncPurchaseOrderFromErp(0));
+        }
+        catch (Exception e) {
+            return AjaxResult.error();
+        }
+    }
+
+
+
+
+
+
+
     /**
      * 单一采购申请单保存->提交->审核
      *
@@ -193,41 +252,6 @@ public class KingdeeErpSyncController {
         }
     }
 
-    /**
-     * 从ERP中同步项目信息
-     * */
-    @GetMapping("/ERPProject")
-    public AjaxResult getERPProject(){
-        try {
-          return AjaxResult.success(kingdeeErpSyncService.syncProjectInfoFromErp(0));
-        }
-        catch (Exception e) {
-            return AjaxResult.error();
-        }
-    }
-    /**
-     * 从ERP中同步销售订单信息
-     * */
-    @GetMapping("/ERPMesSaleOrder")
-    public AjaxResult getERPMesSaleOrder(){
-        try {
-            return AjaxResult.success(kingdeeErpSyncService.syncSaleOrderFromErp(0));
-        }
-        catch (Exception e) {
-            return AjaxResult.error();
-        }
-    }
-    /**
-     * 从ERP中同步采购订单信息
-     * */
-    @GetMapping("/ERPPurchase")
-    public AjaxResult getERPPurchase(){
-        try {
-            return AjaxResult.success(kingdeeErpSyncService.syncPurchaseOrderFromErp(0));
-        }
-        catch (Exception e) {
-            return AjaxResult.error();
-        }
-    }
+
 
 }

hw-modules/hw-jindie/src/main/java/com/hw/jindie/domain/MesBaseSupplierInfo.java

@@ -42,6 +42,8 @@ public class MesBaseSupplierInfo extends BaseEntity
     @Excel(name = "审核日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date auditDate;
 
+    private Date erpModifyDate;
+
     public void setSupplierId(Long supplierId)
     {
         this.supplierId = supplierId;
@@ -97,6 +99,14 @@ public class MesBaseSupplierInfo extends BaseEntity
         return auditDate;
     }
 
+    public Date getErpModifyDate() {
+        return erpModifyDate;
+    }
+
+    public void setErpModifyDate(Date erpModifyDate) {
+        this.erpModifyDate = erpModifyDate;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

hw-modules/hw-jindie/src/main/java/com/hw/jindie/domain/MesPurchaseOrder.java

@@ -131,7 +131,7 @@ public class MesPurchaseOrder extends BaseEntity {
     @Excel(name = "是否标识：1-是；0-否")
     private String isFlag;
     //采购单位id
-    private String unitId;
+    private Long unitId;
     //库存单位
     private Long stockUnitId;
     //计价单位
@@ -148,11 +148,11 @@ public class MesPurchaseOrder extends BaseEntity {
     private Long supplierId;
 
 
-    public String getUnitId() {
+    public Long getUnitId() {
         return unitId;
     }
 
-    public void setUnitId(String unitId) {
+    public void setUnitId(Long unitId) {
         this.unitId = unitId;
     }
 

hw-modules/hw-jindie/src/main/java/com/hw/jindie/domain/MesSaleOrder.java

@@ -173,6 +173,8 @@ public class MesSaleOrder extends BaseEntity {
     //库存组织
     private Long stockOrgId;
 
+    private String tondBase;
+
 
     public Long getStockId() {
         return stockId;
@@ -406,6 +408,14 @@ public class MesSaleOrder extends BaseEntity {
         return isFlag;
     }
 
+    public String getTondBase() {
+        return tondBase;
+    }
+
+    public void setTondBase(String tondBase) {
+        this.tondBase = tondBase;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)

hw-modules/hw-jindie/src/main/java/com/hw/jindie/mapper/MesBaseMaterialInfoMapper.java

@@ -77,7 +77,7 @@ public interface MesBaseMaterialInfoMapper
      * 获取最大的ERP更新时间
      * @return String
      */
-    public String getMaxErpModifyDate();
+    public String selectMaxErpModifyDate();
 
     /**
      * 查询物料信息
@@ -95,10 +95,5 @@ public interface MesBaseMaterialInfoMapper
      */
     public int batchMesBaseMaterialInfo(List<MesBaseMaterialInfo> mesBaseMaterialInfos);
 
-    /**
-     * 通过物料编码查询
-     * */
-    public MesBaseMaterialInfo selectMesBaseMaterialInfoByCode(String materialCode);
-
 
 }

hw-modules/hw-jindie/src/main/java/com/hw/jindie/mapper/MesBaseSupplierInfoMapper.java

@@ -59,4 +59,30 @@ public interface MesBaseSupplierInfoMapper
      * @return 结果
      */
     public int deleteMesBaseSupplierInfoBySupplierIds(Long[] supplierIds);
+
+
+
+
+    /**
+     * 获取最大的ERP更新时间
+     * @return String
+     */
+    public String selectMaxErpModifyDate();
+
+    /**
+     * 查询供应商信息
+     *
+     * @param erpId ERP主键
+     * @return 供应商信息
+     */
+    public MesBaseSupplierInfo selectMesBaseSupplierInfoByErpId(Long erpId);
+
+    /**
+     * 批量新增供应商信息
+     *
+     * @param mesBaseSupplierInfos 供应商信息列表
+     * @return 结果
+     */
+    public int batchMesBaseSupplierInfo(List<MesBaseSupplierInfo> mesBaseSupplierInfos);
+
 }

hw-modules/hw-jindie/src/main/java/com/hw/jindie/mapper/MesProjectInfoMapper.java

@@ -1,5 +1,6 @@
 package com.hw.jindie.mapper;
 
+import com.hw.jindie.domain.MesBaseSupplierInfo;
 import com.hw.jindie.domain.MesProjectInfo;
 
 import java.util.List;
@@ -64,4 +65,21 @@ public interface MesProjectInfoMapper
      * 根据erpid查询
      * */
     public MesProjectInfo selectMesProjectInfoByErpId(Long erpId);
+
+
+
+    /**
+     * 获取最大的ERP更新时间
+     * @return String
+     */
+    public String selectMaxErpModifyDate();
+
+    /**
+     * 批量新增项目信息
+     *
+     * @param mesProjectInfos 项目信息列表
+     * @return 结果
+     */
+    public int batchMesBaseProjectInfo(List<MesProjectInfo> mesProjectInfos);
+
 }

hw-modules/hw-jindie/src/main/java/com/hw/jindie/mapper/MesPurchaseOrderMapper.java

@@ -1,6 +1,7 @@
 package com.hw.jindie.mapper;
 
 import com.hw.jindie.domain.MesPurchaseOrder;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -10,8 +11,7 @@ import java.util.List;
  * @author Yinq
  * @date 2024-02-19
  */
-public interface MesPurchaseOrderMapper
-{
+public interface MesPurchaseOrderMapper {
     /**
      * 查询采购订单信息
      *
@@ -59,8 +59,31 @@ public interface MesPurchaseOrderMapper
      * @return 结果
      */
     public int deleteMesPurchaseOrderByPurchaseOrderIds(Long[] purchaseOrderIds);
+
+
+    /**
+     * 获取最大的ERP更新时间
+     *
+     * @return String
+     */
+    public String selectMaxErpModifyDate();
+
+    /**
+     * 查询销售订单信息
+     *
+     * @param erpId    ERP主键
+     * @param fentryId ERP销售明细主键
+     * @return 销售订单信息
+     */
+    public MesPurchaseOrder selectMesPurchaseOrderByUI(@Param("erpId") Long erpId,
+                                                       @Param("fentryId") Long fentryId);
+
     /**
-     * 根据erpid查询
-     * */
-    public MesPurchaseOrder selectMesPurchaseOrderByErpId(Long erpId);
+     * 批量新增销售订单信息
+     *
+     * @param mesPurchaseOrders 销售订单信息列表
+     * @return 结果
+     */
+    public int batchMesBasePurchaseOrder(List<MesPurchaseOrder> mesPurchaseOrders);
+
 }

hw-modules/hw-jindie/src/main/java/com/hw/jindie/mapper/MesSaleOrderMapper.java

@@ -1,6 +1,7 @@
 package com.hw.jindie.mapper;
 
 import com.hw.jindie.domain.MesSaleOrder;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -10,8 +11,7 @@ import java.util.List;
  * @author Yinq
  * @date 2024-02-19
  */
-public interface MesSaleOrderMapper
-{
+public interface MesSaleOrderMapper {
     /**
      * 查询销售订单信息
      *
@@ -60,8 +60,29 @@ public interface MesSaleOrderMapper
      */
     public int deleteMesSaleOrderBySaleOrderIds(Long[] saleOrderIds);
 
+
+    /**
+     * 获取最大的ERP更新时间
+     *
+     * @return String
+     */
+    public String selectMaxErpModifyDate();
+
+    /**
+     * 查询采购订单信息
+     *
+     * @param erpId    ERP主键
+     * @param fentryId ERP采购明细主键
+     * @return 采购订单信息
+     */
+    public MesSaleOrder selectMesSaleOrderByUI(@Param("erpId") Long erpId,
+                                                   @Param("fentryId") Long fentryId);
+
     /**
-     * 通过erpid查询
-     * */
-    public MesSaleOrder selectMesSaleOrderByErpId(Long erpId);
+     * 批量新增采购订单信息
+     *
+     * @param mesSaleOrders 采购订单信息列表
+     * @return 结果
+     */
+    public int batchMesBaseSaleOrder(List<MesSaleOrder> mesSaleOrders);
 }

hw-modules/hw-jindie/src/main/resources/mapper/jindie/MesBaseMaterialInfoMapper.xml

@@ -243,7 +243,6 @@
 
 
     <select id="selectMaxErpModifyDate" resultType="String">
-        <include refid="selectMesBaseMaterialInfoVo"/>
         SELECT max(erp_modify_date) FROM mes_base_material_info order by erp_id
     </select>
 
@@ -253,15 +252,10 @@
     </select>
 
     <insert id="batchMesBaseMaterialInfo">
-        INSERT INTO mes_base_material_info (erp_id, material_code, old_material_code, material_name, material_categories, material_subclass, material_type_id, batch_flag, material_unit_id, material_unit, material_matkl, material_spec, net_weight, gross_weight, factory_id, create_org_id, use_org_id, prodline_id, active_flag, deleted_flag, remark, purchase_price_unit_id, create_by, create_time,  approve_date, erp_modify_date) VALUES
+        INSERT INTO mes_base_material_info (erp_id, material_code, old_material_code, material_name, material_categories, material_subclass, material_type_id, batch_flag, material_unit_id, material_unit, material_matkl, material_spec, net_weight, gross_weight, factory_id, create_org_id, use_org_id, prodline_id, active_flag, deleted_flag, remark, purchase_price_unit_id, create_by, create_time,  approve_date, erp_modify_date,update_time) VALUES
         <foreach item="item" index="index" collection="list" separator=",">
-            ( #{item.erpId}, #{item.materialCode}, #{item.oldMaterialCode}, #{item.materialName}, #{item.materialCategories}, #{item.materialSubclass}, #{item.materialTypeId}, #{item.batchFlag}, #{item.materialUnifId}, #{item.materialUnit}, #{item.materialMatkl}, #{item.materialSpec}, #{item.netWeight}, #{item.grossWeight}, #{item.factoryId}, #{item.createOrgId}, #{item.useOrgId}, #{item.prodlineId}, #{item.activeFlag}, #{item.deletedFlag}, #{item.remark},  #{item.purchasePriceUnitId}, #{item.createBy}, #{item.createTime}, #{item.approveDate}, #{item.erpModifyDate})
+            ( #{item.erpId}, #{item.materialCode}, #{item.oldMaterialCode}, #{item.materialName}, #{item.materialCategories}, #{item.materialSubclass}, #{item.materialTypeId}, #{item.batchFlag}, #{item.materialUnitId}, #{item.materialUnit}, #{item.materialMatkl}, #{item.materialSpec}, #{item.netWeight}, #{item.grossWeight}, #{item.factoryId}, #{item.createOrgId}, #{item.useOrgId}, #{item.prodlineId}, #{item.activeFlag}, #{item.deletedFlag}, #{item.remark},  #{item.purchasePriceUnitId}, #{item.createBy}, #{item.createTime}, #{item.approveDate}, #{item.erpModifyDate}, #{item.updateTime})
         </foreach>
     </insert>
-    <select id="selectMesBaseMaterialInfoByCode" parameterType="String" resultMap="MesBaseMaterialInfoResult">
-        <include refid="selectMesBaseMaterialInfoVo"/>
-        where material_code = #{materialCode}
-    </select>
-
 
 </mapper>

hw-modules/hw-jindie/src/main/resources/mapper/jindie/MesBaseSupplierInfoMapper.xml

@@ -16,10 +16,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
         <result property="auditDate"    column="audit_date"    />
+        <result property="erpModifyDate"    column="erp_modify_date"    />
     </resultMap>
 
     <sql id="selectMesBaseSupplierInfoVo">
-        select supplier_id, supplier_code, supplier_name, erp_id, supplier_status, remark, create_by, create_time, update_by, update_time, audit_date from mes_base_supplier_info
+        select supplier_id, supplier_code, supplier_name, erp_id, supplier_status, remark, create_by, create_time, update_by, update_time, audit_date,erp_modify_date from mes_base_supplier_info
     </sql>
 
     <select id="selectMesBaseSupplierInfoList" parameterType="MesBaseSupplierInfo" resultMap="MesBaseSupplierInfoResult">
@@ -51,6 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="auditDate != null">audit_date,</if>
+            <if test="erpModifyDate != null">erp_modify_date,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="supplierCode != null">#{supplierCode},</if>
@@ -63,6 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="auditDate != null">#{auditDate},</if>
+            <if test="erpModifyDate != null">#{erpModifyDate},</if>
          </trim>
     </insert>
 
@@ -79,6 +82,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="auditDate != null">audit_date = #{auditDate},</if>
+            <if test="erpModifyDate != null">erp_modify_date = #{erpModifyDate},</if>
         </trim>
         where supplier_id = #{supplierId}
     </update>
@@ -93,4 +97,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{supplierId}
         </foreach>
     </delete>
+
+
+
+
+    <select id="selectMaxErpModifyDate" resultType="String">
+        SELECT max(erp_modify_date) FROM mes_base_supplier_info order by erp_id
+    </select>
+
+    <select id="selectMesBaseSupplierInfoByErpId" parameterType="Long"
+            resultMap="MesBaseSupplierInfoResult">
+        select supplier_id from mes_base_supplier_info where erp_id = #{erpId} limit 1
+    </select>
+
+    <insert id="batchMesBaseSupplierInfo">
+        INSERT INTO mes_base_supplier_info (supplier_code, supplier_name, erp_id, supplier_status, remark, create_by, create_time, update_by, update_time, audit_date, erp_modify_date) VALUES
+        <foreach item="item" index="index" collection="list" separator=",">
+            (#{item.supplierCode}, #{item.supplierName},#{item.erpId}, #{item.supplierStatus}, #{item.remark}, #{item.createBy}, #{item.createTime}, #{item.updateBy}, #{item.updateTime}, #{item.auditDate}, #{item.erpModifyDate})
+        </foreach>
+    </insert>
+
 </mapper>

hw-modules/hw-jindie/src/main/resources/mapper/jindie/MesProjectInfoMapper.xml

@@ -131,6 +131,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectMesProjectInfoByErpId" parameterType="Long" resultMap="MesProjectInfoResult">
         <include refid="selectMesProjectInfoVo"/>
-        where erp_id = #{erpId}
+        where erp_id = #{erpId} limit 1
     </select>
+
+
+
+
+    <select id="selectMaxErpModifyDate" resultType="String">
+        SELECT max(erp_modify_date) FROM mes_project_info order by erp_id
+    </select>
+
+
+    <insert id="batchMesBaseProjectInfo">
+        INSERT INTO mes_project_info (erp_id, project_no, project_name, document_status, forbid_status, audit_date, erp_modify_date, order_status, complete_date, create_time,update_time) VALUES
+        <foreach item="item" index="index" collection="list" separator=",">
+            (#{item.erpId}, #{item.projectNo}, #{item.projectName},#{item.documentStatus}, #{item.forbidStatus}, #{item.auditDate}, #{item.erpModifyDate}, #{item.orderStatus}, #{item.completeDate}, #{item.createTime}, #{item.updateTime})
+        </foreach>
+    </insert>
+
 </mapper>

hw-modules/hw-jindie/src/main/resources/mapper/jindie/MesPurchaseOrderMapper.xml

@@ -198,8 +198,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{purchaseOrderId}
         </foreach>
     </delete>
-    <select id="selectMesPurchaseOrderByErpId" parameterType="Long" resultMap="MesPurchaseOrderResult">
+
+    <select id="selectMaxErpModifyDate" resultType="String">
+        SELECT max(erp_modify_date) FROM mes_purchase_order order by erp_id,fentry_id
+    </select>
+
+    <select id="selectMesPurchaseOrderByUI" resultMap="MesPurchaseOrderResult">
         <include refid="selectMesPurchaseOrderVo"/>
-        where erp_id = #{erpId}
+        where erp_id = #{erpId} and fentry_id = #{fentryId} limit 1
     </select>
+
+
+    <insert id="batchMesBasePurchaseOrder">
+        INSERT INTO mes_purchase_order (erp_id, fentry_id, po_no, document_status, material_id, material_code, material_name, order_amount, complete_amount, approve_date, erp_modify_date, plan_delivery_date, order_status, unit_id, stock_unit_id, price_unit_id, aux_prop_id, src_bill_no, purchase_org_id, tond_base, supplier_id,  create_time,update_time) VALUES
+        <foreach item="item" index="index" collection="list" separator=",">
+            (#{item.erpId}, #{item.fentryId}, #{item.poNo},#{item.documentStatus}, #{item.materialId}, #{item.materialCode}, #{item.materialName}, #{item.orderAmount}, #{item.completeAmount}, #{item.approveDate}, #{item.erpModifyDate}, #{item.planDeliveryDate}, #{item.orderStatus}, #{item.unitId}, #{item.stockUnitId}, #{item.priceUnitId}, #{item.auxPropId}, #{item.srcBillNo}, #{item.purchaseOrgId}, #{item.tondBase}, #{item.supplierId}, #{item.createTime},#{item.updateTime})
+        </foreach>
+    </insert>
 </mapper>

hw-modules/hw-jindie/src/main/resources/mapper/jindie/MesSaleOrderMapper.xml

@@ -39,6 +39,7 @@
         <result property="ownerId" column="owner_id"/>
         <result property="price" column="price"/>
         <result property="stockOrgId" column="stock_org_id"/>
+        <result property="tondBae" column="tond_base"/>
     </resultMap>
 
     <sql id="selectMesSaleOrderVo">
@@ -253,4 +254,24 @@
         <include refid="selectMesSaleOrderVo"/>
         where erp_id = #{erpId}
     </select>
+
+
+
+    <select id="selectMaxErpModifyDate" resultType="String">
+        SELECT max(erp_modify_date) FROM mes_sale_order order by erp_id,fentry_id
+    </select>
+
+    <select id="selectMesSaleOrderByUI" resultMap="MesSaleOrderResult">
+        <include refid="selectMesSaleOrderVo"/>
+        where erp_id = #{erpId} and fentry_id = #{fentryId} limit 1
+    </select>
+
+
+    <insert id="batchMesBaseSaleOrder">
+        INSERT INTO mes_sale_order (erp_id, fentry_id, saleorder_code, saleorder_linenumber, document_statsu, material_id, material_code, material_name, matkl, order_amount, complete_amount, release_qty,  approve_date, erp_modify_date, plan_delivery_date, stock_id, owner_id, aux_prop_id, sale_dept_id, price, stock_org_id, tond_base, create_time,update_time) VALUES
+        <foreach item="item" index="index" collection="list" separator=",">
+            (#{item.erpId}, #{item.fentryId}, #{item.saleorderCode}, #{item.saleorderLinenumber}, #{item.documentStatus}, #{item.materialId}, #{item.materialCode}, #{item.materialName}, #{item.matkl}, #{item.orderAmount}, #{item.completeAmount}, #{item.releaseQty}, #{item.approveDate}, #{item.erpModifyDate}, #{item.planDeliveryDate}, #{item.stockId}, #{item.ownerId}, #{item.auxPropId}, #{item.saleDeptId}, #{item.price}, #{item.stockOrgId},  #{item.tondBase}, #{item.createTime}, #{item.updateTime})
+        </foreach>
+    </insert>
+
 </mapper>

hw-modules/hw-job/src/main/java/com/hw/job/task/RyTask.java

@@ -67,15 +67,28 @@ public class RyTask
         System.out.println("++创建保养工单++getDmsMaintInstance");
         remoteDmsService.getDmsBillsMaintInstance(SecurityConstants.INNER,planMaintCode);
     }
-    public void ERPSynMesSupplierInfo(String beginTime, String endTime){
+    public void syncSupplierInfoFromErp(){
         System.out.println("++同步ERP中物料供应商++ErpSupplierInfo");
-        remoteJindieService.ErpSupplierInfo(SecurityConstants.INNER);
+        remoteJindieService.syncSupplierInfoFromErp(SecurityConstants.INNER);
     }
-    public void ERPSynMesMaterialInfo(String beginTime, String endTime){
-
-        //todo 查询createtime>上次执行时间和updatetime>上次执行时间的，要区分是第一次查询还是后续查询
+    public void syncMaterialInfoFromErp(){
         System.out.println("++同步ERP中物料信息++ErpMesMaterialInfo");
-        remoteJindieService.ErpMesMaterialInfo(SecurityConstants.INNER);
+        remoteJindieService.syncMaterialInfoFromErp(SecurityConstants.INNER);
+    }
+
+    public void syncProjectInfoFromErp(){
+        System.out.println("++同步ERP中项目信息++ErpProjectInfo");
+        remoteJindieService.syncProjectInfoFromErp(SecurityConstants.INNER);
+    }
+
+    public void syncSaleOrderFromErp(){
+        System.out.println("++同步ERP中销售订单信息++ErpSaleOrder");
+        remoteJindieService.syncSaleOrderFromErp(SecurityConstants.INNER);
+    }
+
+    public void syncPurchaseOrderFromErp(){
+        System.out.println("++同步ERP中采购订单信息++ErpPurchaseOrder");
+        remoteJindieService.syncPurchaseOrderFromErp(SecurityConstants.INNER);
     }
 
 }