1 客户管理和条码管理

src/main/java/org/rcisoft/bus/bcustomer/controller/BCustomerController.java

@@ -56,7 +56,7 @@ public class BCustomerController extends CyPaginationController<BCustomer> {
     @ApiOperation(value="逻辑删除BCustomer", notes="逻辑删除BCustomer")
     @ApiImplicitParams({@ApiImplicitParam(name = "businessId", value = "businessId", required = true, dataType = "varchar")})
     @DeleteMapping("/deleteLogical/{businessId:\\w+}")
-    public CyResult deleteLogical(@PathVariable String businessId,BCustomer bCustomer) {
+    public CyResult deleteLogical(@PathVariable Integer businessId,BCustomer bCustomer) {
         bCustomer.setBusinessId(businessId);
         CyPersistModel data = bCustomerServiceImpl.removeLogical(bCustomer);
         return CyResultGenUtil.builder(data,
@@ -69,7 +69,7 @@ public class BCustomerController extends CyPaginationController<BCustomer> {
     @ApiOperation(value="删除BCustomer", notes="删除BCustomer")
     @ApiImplicitParams({@ApiImplicitParam(name = "businessId", value = "businessId", required = true, dataType = "varchar")})
     @DeleteMapping("/delete/{businessId:\\w+}")
-    public CyResult delete(@PathVariable String businessId,BCustomer bCustomer) {
+    public CyResult delete(@PathVariable Integer businessId,BCustomer bCustomer) {
         bCustomer.setBusinessId(businessId);
         CyPersistModel data = bCustomerServiceImpl.remove(bCustomer);
         return CyResultGenUtil.builder(data,
@@ -83,7 +83,7 @@ public class BCustomerController extends CyPaginationController<BCustomer> {
     @ApiOperation(value="修改BCustomer", notes="修改BCustomer")
     @ApiImplicitParams({@ApiImplicitParam(name = "businessId", value = "businessId", required = false, dataType = "varchar")})
     @PutMapping("/update/{businessId:\\w+}")
-    public CyResult update(@PathVariable String businessId, @Valid BCustomer bCustomer, BindingResult bindingResult) {
+    public CyResult update(@PathVariable Integer businessId, @Valid BCustomer bCustomer, BindingResult bindingResult) {
         bCustomer.setBusinessId(businessId);
         CyPersistModel data = bCustomerServiceImpl.merge(bCustomer);
         return CyResultGenUtil.builder(data,

src/main/java/org/rcisoft/bus/bcustomer/entity/BCustomer.java

@@ -12,188 +12,189 @@ import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
 import com.baomidou.mybatisplus.annotation.TableName;
+import org.rcisoft.core.entity.CyIdIncreEntity;
 
 /**
 * Created with cy on 2024年5月11日 下午3:19:37.
 */
 @Data
 @TableName("b_customer")
-public class BCustomer  extends CyIdEntity<BCustomer> {
+public class BCustomer  extends CyIdIncreEntity<BCustomer> {
 
 
 
      /**
-     * @desc 
+     * @desc
      * @column cust_code
-     * @default 
+     * @default
      */
      @Excel(name = "custCode", orderNum = "0", width = 20)
      private String custCode;
 
      /**
-     * @desc 
+     * @desc
      * @column cust_name
-     * @default 
+     * @default
      */
      @Excel(name = "custName", orderNum = "1", width = 20)
      private String custName;
 
      /**
-     * @desc 
+     * @desc
      * @column cust_group
-     * @default 
+     * @default
      */
      @Excel(name = "custGroup", orderNum = "2", width = 20)
      private String custGroup;
 
      /**
-     * @desc 
+     * @desc
      * @column cust_group2
-     * @default 
+     * @default
      */
      @Excel(name = "custGroup2", orderNum = "3", width = 20)
      private String custGroup2;
 
      /**
-     * @desc 
+     * @desc
      * @column cust_rt1
-     * @default 
+     * @default
      */
      @Excel(name = "custRt1", orderNum = "4", width = 20)
      private String custRt1;
 
      /**
-     * @desc 
+     * @desc
      * @column cust_io
-     * @default 
+     * @default
      */
      @Excel(name = "custIo", orderNum = "5", width = 20)
      private String custIo;
 
      /**
-     * @desc 
+     * @desc
      * @column cust_newpic
-     * @default 
+     * @default
      */
      @Excel(name = "custNewpic", orderNum = "6", width = 20)
      private String custNewpic;
 
      /**
-     * @desc 
+     * @desc
      * @column cust_group1
-     * @default 
+     * @default
      */
      @Excel(name = "custGroup1", orderNum = "7", width = 20)
      private String custGroup1;
 
      /**
-     * @desc 
+     * @desc
      * @column cust_rt2
-     * @default 
+     * @default
      */
      @Excel(name = "custRt2", orderNum = "8", width = 20)
      private String custRt2;
 
      /**
-     * @desc 
+     * @desc
      * @column cust_rout
-     * @default 
+     * @default
      */
      @Excel(name = "custRout", orderNum = "9", width = 20)
      private String custRout;
 
      /**
-     * @desc 
+     * @desc
      * @column cust_addr
-     * @default 
+     * @default
      */
      @Excel(name = "custAddr", orderNum = "10", width = 20)
      private String custAddr;
 
      /**
-     * @desc 
+     * @desc
      * @column cust_g0
-     * @default 
+     * @default
      */
      @Excel(name = "custG0", orderNum = "11", width = 20)
      private String custG0;
 
      /**
-     * @desc 
+     * @desc
      * @column cust_g20
-     * @default 
+     * @default
      */
      @Excel(name = "custG20", orderNum = "12", width = 20)
      private String custG20;
 
      /**
-     * @desc 
+     * @desc
      * @column cust_g30
-     * @default 
+     * @default
      */
      @Excel(name = "custG30", orderNum = "13", width = 20)
      private String custG30;
 
      /**
-     * @desc 
+     * @desc
      * @column cust_g201
-     * @default 
+     * @default
      */
      @Excel(name = "custG201", orderNum = "14", width = 20)
      private String custG201;
 
      /**
-     * @desc 
+     * @desc
      * @column cust_save
-     * @default 
+     * @default
      */
      @Excel(name = "custSave", orderNum = "15", width = 20)
      private String custSave;
 
      /**
-     * @desc 
+     * @desc
      * @column cust_stype
-     * @default 
+     * @default
      */
      @Excel(name = "custStype", orderNum = "16", width = 20)
      private String custStype;
 
      /**
-     * @desc 
+     * @desc
      * @column cust_g1
-     * @default 
+     * @default
      */
      @Excel(name = "custG1", orderNum = "17", width = 20)
      private String custG1;
 
      /**
-     * @desc 
+     * @desc
      * @column cust_yj
-     * @default 
+     * @default
      */
      @Excel(name = "custYj", orderNum = "18", width = 20)
      private String custYj;
 
      /**
-     * @desc 
+     * @desc
      * @column cust_yj2
-     * @default 
+     * @default
      */
      @Excel(name = "custYj2", orderNum = "19", width = 20)
      private String custYj2;
 
      /**
-     * @desc 
+     * @desc
      * @column cust_yj3
-     * @default 
+     * @default
      */
      @Excel(name = "custYj3", orderNum = "20", width = 20)
      private String custYj3;
 
      /**
-     * @desc 
+     * @desc
      * @column cust_gc
-     * @default 
+     * @default
      */
      @Excel(name = "custGc", orderNum = "21", width = 20)
      private String custGc;