调整

src/main/java/com/qs/serve/modules/bms/entity/BmsSupplier.java

@@ -280,6 +280,7 @@ public class BmsSupplier implements Serializable {
     private String isRegionNull;
 
     /** 关键字 */
+    @TableField(exist = false)
     private String keyword;
 
     /*--------------  ----------------- */

src/main/java/com/qs/serve/modules/exl/common/TableCreateSqlUtil.java

@@ -29,7 +29,7 @@ public class TableCreateSqlUtil {
 
     public static String createMysqlTableSql(String tableName,String tableRemark, List<ExlColumnConf> columnList){
         StringBuffer result = new StringBuffer("CREATE TABLE `"+tableName+"` (");
-        result.append(" `union_row_id` varchar(255) NOT NULL AUTO_INCREMENT COMMENT 'union_row_id',");
+        result.append(" `union_row_id` varchar(255) NOT NULL COMMENT 'union_row_id',");
         for (ExlColumnConf column : columnList) {
             String columnType = MYSQL_DATA_MAP.get(column.getColumnType())==null?column.getColumnType():MYSQL_DATA_MAP.get(column.getColumnType());
             String nullValue = column.getNotNullFlag().equals(1) ? COLUMN_NOT_NULL:COLUMN_NULL;

src/main/java/com/qs/serve/modules/exl/controller/ExlTableDataController.java

@@ -69,6 +69,7 @@ public class ExlTableDataController {
         // columns
         LambdaQueryWrapper<ExlColumnConf> columnLqw = new LambdaQueryWrapper<>();
         columnLqw.eq(ExlColumnConf::getTableConfId,tableConfigId);
+        columnLqw.orderByAsc(ExlColumnConf::getSort);
         List<ExlColumnConf> columnList = exlColumnConfService.list(columnLqw);
         // query
         Map<String, Object> queryMap = buildQueryMap(map, columnList);
@@ -146,6 +147,7 @@ public class ExlTableDataController {
         // columns
         LambdaQueryWrapper<ExlColumnConf> columnLqw = new LambdaQueryWrapper<>();
         columnLqw.eq(ExlColumnConf::getTableConfId,tableConfigId);
+        columnLqw.orderByAsc(ExlColumnConf::getSort);
         List<ExlColumnConf> columnList = exlColumnConfService.list(columnLqw);
         // query
         Map<String, Object> queryMap = buildQueryMap(map, columnList);
@@ -169,6 +171,7 @@ public class ExlTableDataController {
         // columns
         LambdaQueryWrapper<ExlColumnConf> columnLqw = new LambdaQueryWrapper<>();
         columnLqw.eq(ExlColumnConf::getTableConfId,tableConfigId);
+        columnLqw.orderByAsc(ExlColumnConf::getSort);
         List<ExlColumnConf> columnList = exlColumnConfService.list(columnLqw);
 
         String targetTableName = ExlConst.TABLE_NAME_PRE + tableConf.getTableName();
@@ -230,7 +233,9 @@ public class ExlTableDataController {
             for (String field : objectMap.keySet()) {
                 Object value = objectMap.get(field);
                 if(value!=null&&value.getClass().getName().equals("java.sql.Timestamp")){
-                    objectMap.put(field,value.toString().split(".")[0]);
+                    if(value.toString().contains(".")){
+                        objectMap.put(field,value.toString().split("\\.")[0]);
+                    }
                 }
             }
         }

src/main/java/com/qs/serve/modules/exl/entity/ExlColumnConf.java

@@ -60,6 +60,8 @@ public class ExlColumnConf implements Serializable {
     /** 空值标识 */
     private Integer keyFlag;
 
+    private Integer sort;
+
     /** 创建时间 */
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")

src/main/java/com/qs/serve/modules/oms/controller/api/OmsOrderApi.java

@@ -11,6 +11,7 @@ import com.qs.serve.common.util.PageUtil;
 import com.qs.serve.modules.bms.entity.BmsSupplier;
 import com.qs.serve.modules.oms.entity.OmsOrder;
 import com.qs.serve.modules.oms.entity.OmsOrderItem;
+import com.qs.serve.modules.oms.entity.bo.OmsCancelOrder;
 import com.qs.serve.modules.oms.entity.bo.OmsOrderBo;
 import com.qs.serve.modules.oms.entity.vo.OmsConfirmOrderResult;
 import com.qs.serve.modules.oms.service.OmsOrderItemService;
@@ -56,6 +57,21 @@ public class OmsOrderApi {
         return R.ok(omsOrderService.createOrder(omsOrderBo));
     }
 
+    /**
+     * 取消订单
+     * @param omsOrderBo
+     * @return
+     */
+    @PostMapping("/cancelOrder")
+    public R<?> cancelOrder(@RequestBody @Valid OmsCancelOrder omsOrderBo){
+        OmsOrder omsOrder = omsOrderService.getById(omsOrderBo.getOrderId());
+        if(omsOrder.getStatus().equals(0)&&omsOrder.getCheckState().equals(0)){
+            omsOrder.setStatus(2);
+            return R.ok();
+        }
+        return R.ok(omsOrderBo);
+    }
+
     /**
      * 翻页查询
      * @param param

src/main/java/com/qs/serve/modules/oms/entity/OmsOrder.java

@@ -104,7 +104,7 @@ public class OmsOrder implements Serializable {
     /** 是否加急 */
     private Integer urgentFlag;
 
-    /** 订单状态 */
+    /** 订单状态 0->待 */
     private Integer status;
 
     /** 备注 */

src/main/java/com/qs/serve/modules/oms/entity/bo/OmsCancelOrder.java

@@ -0,0 +1,22 @@
+package com.qs.serve.modules.oms.entity.bo;
+
+import lombok.Data;
+
+/**
+ * @author YenHex
+ * @since 2023/8/21
+ */
+@Data
+public class OmsCancelOrder {
+
+    /**
+     * 取消的订单Id
+     */
+    private String orderId;
+
+    /**
+     * 取消原因
+     */
+    private String reason;
+
+}