盘点表名为关键字bug修复

code-generation/pom.xml

@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.sd</groupId>
-        <artifactId>sd-bom</artifactId>
+        <artifactId>sd_project</artifactId>
         <version>1.0</version>
     </parent>
 

pom.xml

@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>com.sd</groupId>
-    <artifactId>sd-bom</artifactId>
+    <artifactId>sd_project</artifactId>
     <version>1.0</version>
 
     <packaging>pom</packaging>

sd-business/pom.xml

@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.sd</groupId>
-        <artifactId>sd-bom</artifactId>
+        <artifactId>sd_project</artifactId>
         <version>1.0</version>
     </parent>
 

sd-business/src/main/java/com/sd/business/entity/check/po/Check.java

@@ -18,7 +18,7 @@ import javax.validation.constraints.NotNull;
  */
 @Getter
 @Setter
-@TableName("check")
+@TableName("`check`")
 public class Check extends BasePo {
 
     /**

sd-business/src/main/java/com/sd/business/entity/in/dto/InOutStorageBomSelectDto.java

@@ -45,6 +45,11 @@ public class InOutStorageBomSelectDto extends BaseSelectDto {
     private String warehouseName;
 
     /**
+     * 类型 1入库 0出库
+     */
+    private Integer type;
+
+    /**
      * 出入库明细
      */
     private Integer detailType;

sd-business/src/main/java/com/sd/business/entity/order/dto/OrderSelectDto.java

@@ -49,4 +49,9 @@ public class OrderSelectDto extends BaseSelectDto {
      */
     private Integer linkedStatementOfAccount;
 
+    /**
+     * 异常订单，1是 0否
+     */
+    private Integer exception;
+
 }

sd-business/src/main/java/com/sd/business/entity/order/enums/OrderExceptionTypeEnum.java

@@ -11,12 +11,13 @@ import java.util.Map;
 @AllArgsConstructor
 public enum OrderExceptionTypeEnum {
 
-    normal(0, "正常订单"),
+    NORMAL(0, "正常订单"),
     ORDER_CLOSURE(1, "万里牛状态异常：订单关闭"),
     ORDER_ABORT(2, "万里牛状态异常：订单异常结束"),
     ORDER_EXCEPTION_HANDLING(3, "万里牛状态异常：订单异常处理"),
     UNKNOWN_WAREHOUSE(4, "无法通过仓库编码找到事业部"),
     UNKNOWN_SKU_SPEC(5, "订单存在未知sku规格"),
+    UNKNOWN_BOM_SPEC(6, "订单sku规格未绑定bom规格"),
 
     ;
 
@@ -42,5 +43,12 @@ public enum OrderExceptionTypeEnum {
         return orderExceptionTypeEnum;
     }
 
+    /**
+     * 通过key获取名称
+     */
+    public static String getEnumValue(Integer key) {
+        return getEnum(key).getValue();
+    }
+
 
 }

sd-business/src/main/java/com/sd/business/entity/order/vo/OrderInfoVo.java

@@ -17,6 +17,11 @@ import java.util.List;
 public class OrderInfoVo extends OrderInfo {
 
     /**
+     * 异常明细
+     */
+    private String exceptionTypeDetail;
+
+    /**
      * 事业部
      */
     private String departmentName;

sd-business/src/main/java/com/sd/business/service/in/impl/InOutStorageBomServiceImpl.java

@@ -38,6 +38,7 @@ public class InOutStorageBomServiceImpl extends ServiceImpl<InOutStorageBomMappe
         wrapper.like("bs", BomSpec::getName, dto.getBomSpecName());
         wrapper.eq("ios", InOutStorage::getDepartmentId, dto.getDepartmentId());
         wrapper.like("w", Warehouse::getName, dto.getWarehouseName());
+        wrapper.eq("ios", InOutStorage::getType, dto.getType());
         wrapper.eq("ios", InOutStorage::getDetailType, dto.getDetailType());
         wrapper.ge("ios", InOutStorage::getCreateTime, dto.getBeginTime());
         wrapper.le("ios", InOutStorage::getCreateTime, dto.getEndTime());

sd-business/src/main/java/com/sd/business/service/order/impl/OrderServiceImpl.java

@@ -1,6 +1,7 @@
 package com.sd.business.service.order.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -15,6 +16,7 @@ import com.sd.business.entity.order.dto.OrderInfoDto;
 import com.sd.business.entity.order.dto.OrderSelectDto;
 import com.sd.business.entity.order.dto.OrderSkuDto;
 import com.sd.business.entity.order.dto.SkuSpecPriceDto;
+import com.sd.business.entity.order.enums.OrderExceptionTypeEnum;
 import com.sd.business.entity.order.enums.OrderStatusEnum;
 import com.sd.business.entity.order.po.OrderInfo;
 import com.sd.business.entity.order.po.OrderOperatingLog;
@@ -101,7 +103,36 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, OrderInfo> implem
                     OrderStatusEnum.HAVE_BEEN_SHIPPED.getKey());
         }
 
-        return this.baseMapper.getPage(dto.getPage(), wrapper);
+        if (dto.getException() != null) {
+            if (dto.getException().equals(StatusConstant.YES)) {
+                wrapper.eq("o", OrderInfo::getExceptionType, "0");
+            } else {
+                wrapper.ne("o", OrderInfo::getExceptionType, "0");
+            }
+        }
+
+        Page<OrderInfoVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+        List<OrderInfoVo> records = page.getRecords();
+
+        if (records.size() == 0) {
+            return page;
+        }
+
+        for (OrderInfoVo record : records) {
+
+            // 设置异常提示
+            String exceptionType = record.getExceptionType();
+            if (exceptionType.equals("0")) {
+                continue;
+            }
+            String exceptionTypeDetail = Arrays.stream(exceptionType.split(","))
+                    .map(Convert::toInt)
+                    .map(OrderExceptionTypeEnum::getEnumValue)
+                    .collect(Collectors.joining(","));
+            record.setExceptionTypeDetail(exceptionTypeDetail);
+        }
+
+        return page;
     }
 
     @Override

sd-business/src/main/resources/mapper/check/CheckMapper.xml

@@ -12,7 +12,7 @@
                w.type warehouseType,
                w.name warehouseName,
                d.name departmentName
-        from check c
+        from `check` c
                  left join warehouse w on c.warehouse_id = w.id
                  left join department d on c.department_id = d.id
             ${ew.customSqlSegment}

sd-framework/pom.xml

@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.sd</groupId>
-        <artifactId>sd-bom</artifactId>
+        <artifactId>sd_project</artifactId>
         <version>1.0</version>
     </parent>
 

sd-starter/pom.xml

@@ -6,7 +6,7 @@
 
     <parent>
         <groupId>com.sd</groupId>
-        <artifactId>sd-bom</artifactId>
+        <artifactId>sd_project</artifactId>
         <version>1.0</version>
     </parent>
 

sd-wln/pom.xml

@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.sd</groupId>
-        <artifactId>sd-bom</artifactId>
+        <artifactId>sd_project</artifactId>
         <version>1.0</version>
     </parent>
 

sd-wln/src/main/java/com/sd/wln/service/impl/WlnOrderServiceImpl.java

@@ -151,7 +151,7 @@ public class WlnOrderServiceImpl implements WlnOrderService {
         orderInfo.setRemark(wlnOrder.getString("remark"));
 
         // 赋值订单异常类型
-        orderInfo.setExceptionType("0");
+        orderInfo.setExceptionType(OrderExceptionTypeEnum.NORMAL.getKey().toString());
         if (orderInfo.getWlnStatus() == 10) {
             addExceptionType(orderInfo, OrderExceptionTypeEnum.ORDER_CLOSURE);
         }
@@ -330,9 +330,6 @@ public class WlnOrderServiceImpl implements WlnOrderService {
 
         List<OrderSku> orderSkuList = new ArrayList<>();
 
-        // 是否异常
-        boolean isException = false;
-
         // 创建订单sku
         for (JSONObject wlnOrderSku : wlnOrder.getJSONArray("orders").toJavaList(JSONObject.class)) {
 
@@ -343,7 +340,9 @@ public class WlnOrderServiceImpl implements WlnOrderService {
             SkuSpec skuSpec = skuSpecMap.get(sysSpecUid);
 
             if (skuSpec == null) {
-                isException = true;
+                addExceptionType(orderInfo, OrderExceptionTypeEnum.UNKNOWN_SKU_SPEC);
+            } else if (skuSpec.getBomSpecId() == null) {
+                addExceptionType(orderInfo, OrderExceptionTypeEnum.UNKNOWN_BOM_SPEC);
             }
 
             // 创建订单sku
@@ -352,10 +351,6 @@ public class WlnOrderServiceImpl implements WlnOrderService {
 
         }
 
-        if (isException) {
-            addExceptionType(orderInfo, OrderExceptionTypeEnum.UNKNOWN_SKU_SPEC);
-        }
-
         // 订单关联
         List<Long> skuSpecIdList = orderSkuList.stream().map(OrderSku::getSkuSpecId).collect(Collectors.toList());
         List<SkuSpecLink> list = skuSpecLinkService.list(q -> q