Merge remote-tracking branch 'origin/dev' into dev

zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/ErpCompanyController.java

@@ -125,12 +125,4 @@ public class ErpCompanyController {
         return success(TEST);
     }
 
-    @PostMapping("/test2")
-    @Operation(summary = "获取base的金属元素")
-    @PreAuthorize("@ss.hasPermission('sply:erp-company:get')")
-    public CommonResult<String> test2() {
-        String TEST = erpCompanyService.test2();
-        return success(TEST);
-    }
-
 }

zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/ErpProductiveOrderPageReqVO.java

@@ -19,7 +19,7 @@ public class ErpProductiveOrderPageReqVO extends PageParam {
     private String companyNumber;
 
     @Schema(description = "工厂编码")
-    @NotEmpty(message = "公司编号不能为空")
+    @NotEmpty(message = "工厂编码不能为空")
     private String factoryNumber;
 
     @Schema(description = "工厂名称", example = "赵六")
@@ -30,12 +30,12 @@ public class ErpProductiveOrderPageReqVO extends PageParam {
 
     @Schema(description = "基本开始日期")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    @NotEmpty(message = "公司编号不能为空")
+    @NotEmpty(message = "基本开始日期不能为空")
     private LocalDateTime[] startDate;
 
     @Schema(description = "基本完成日期")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    @NotEmpty(message = "公司编号不能为空")
+    @NotEmpty(message = "基本完成日期不能为空")
     private LocalDateTime[] endDate;
 
     @Schema(description = "主产品物料编号")

zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpCustomerMapper.java

@@ -6,6 +6,9 @@ import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.zt.plat.module.erp.controller.admin.erp.vo.ErpCustomerPageReqVO;
 import com.zt.plat.module.erp.dal.dataobject.erp.ErpCustomerDO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * ERP客商主数据 Mapper
@@ -29,4 +32,5 @@ public interface ErpCustomerMapper extends BaseMapperX<ErpCustomerDO> {
                 .orderByDesc(ErpCustomerDO::getId));
     }
 
+    void updateBatchByNumber(@Param("toUpdate")  List<ErpCustomerDO> toUpdate);
 }

zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpCompanyService.java

@@ -74,6 +74,4 @@ public interface ErpCompanyService {
     void test();
 
     String test1();
-
-    String test2();
 }

zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpCompanyServiceImpl.java

@@ -286,11 +286,4 @@ public class ErpCompanyServiceImpl implements ErpCompanyService {
             return url + requestEntity;
         }
     }
-
-    @Override
-    public String test2() {
-        ElementDTO respVO = new ElementDTO();
-        CommonResult<List<ElementDTO>> dtos = baseApi.getElementNoPage();
-        return dtos.toString();
-    }
 }

zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpCustomerMapper.xml

@@ -8,4 +8,22 @@
         代码生成器暂时只生成 Mapper XML 文件本身，更多推荐 MybatisX 快速开发插件来生成查询。
         文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
      -->
+    <update id="updateBatchByNumber">
+        <foreach collection="toUpdate" item="item" separator=";" open="BEGIN" close=";END;">
+            UPDATE sply_erp_cstm
+            <set>
+                <if test="item.number != null">NUM = #{item.number},</if>
+                <if test="item.name != null">NAME = #{item.name},</if>
+                <if test="item.accountGroup != null">ACCT_GRP = #{item.accountGroup},</if>
+                <if test="item.description != null">DSP = #{item.description},</if>
+                <if test="item.centerNumber != null">CTR_NUM = #{item.centerNumber},</if>
+                <if test="item.createDate != null">CRT_DT = #{item.createDate},</if>
+                <if test="item.repairDate != null">RPR_DT = #{item.repairDate},</if>
+                <if test="item.isGiveback != null">IS_GIV = #{item.isGiveback},</if>
+                <if test="item.isProvisional != null">IS_PRVS = #{item.isProvisional},</if>
+                <if test="item.taxNumber != null">TAX_NUM = #{item.taxNumber},</if>
+             </set>
+            WHERE NUM = #{item.downCenterNumber}
+        </foreach>
+    </update>
 </mapper>