优化

hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/dal/mysql/saleorder/SaleOrderMapper.java

@@ -63,6 +63,10 @@ public interface SaleOrderMapper extends BaseMapperX<SaleOrderDO> {
         if (ObjectUtil.equals(BillStatusEnum.YPLAN.getValue(), tabType)) {
             query.eqIfPresent(SaleOrderDO::getBillStatus, BillStatusEnum.YPLAN.getValue());
         }
+        // 已完成
+        if (ObjectUtil.equals(BillStatusEnum.COMPLETED.getValue(), tabType)) {
+            query.eqIfPresent(SaleOrderDO::getBillStatus, BillStatusEnum.COMPLETED.getValue());
+        }
     }
 
 

hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderServiceImpl.java

@@ -250,6 +250,10 @@ public class SaleOrderServiceImpl implements SaleOrderService {
         if (ObjectUtil.equals(BillStatusEnum.YPLAN.getValue(), pageReqVO.getTabType())) {
             pageReqVO.setBillStatus(BillStatusEnum.YPLAN.getValue());
         }
+        // 已完成
+        if (ObjectUtil.equals(BillStatusEnum.COMPLETED.getValue(), pageReqVO.getTabType())) {
+            pageReqVO.setBillStatus(BillStatusEnum.COMPLETED.getValue());
+        }
         saleOrderMapper.selectPageV2(page,pageReqVO);
         PageResult<SaleOrderDO> saleOrderDOPageResult = new PageResult<>(page.getRecords(), page.getTotal());
         saleOrderDOPageResult.setOtherMap(MapUtil.of("querySumTotalQty",BigDecimal.ZERO));
@@ -294,6 +298,12 @@ public class SaleOrderServiceImpl implements SaleOrderService {
             lambdaQueryWrapper1.eq(SaleOrderDO::getCustomerId, customerId);
         }
 
+        LambdaQueryWrapper<SaleOrderDO> lambdaQueryWrapper2 = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper2.eq(SaleOrderDO::getBillStatus, BillStatusEnum.YPLAN.getValue());
+        if (customerId != null) {
+            lambdaQueryWrapper2.eq(SaleOrderDO::getCustomerId, customerId);
+        }
+
  /*       LambdaQueryWrapper<SaleOrderDO> lambdaQueryWrapper2 = new LambdaQueryWrapper<>();
         lambdaQueryWrapper2.eq(SaleOrderDO::getOrderStatus, BillStatusEnum.YPLAN.getValue());
         if(customerId!=null){
@@ -306,8 +316,10 @@ public class SaleOrderServiceImpl implements SaleOrderService {
         // 查询已生产订单数量
         counts.put(BillStatusEnum.AUDIT.getValue(),
                 saleOrderMapper.selectCount(lambdaQueryWrapper1));
+        // 查询已排产订单数量
+        counts.put(BillStatusEnum.YPLAN.getValue(), saleOrderMapper.selectCount(lambdaQueryWrapper2));
         // 查询已完成订单数量
-        counts.put(BillStatusEnum.YPLAN.getValue(), 0L);
+        counts.put(BillStatusEnum.COMPLETED.getValue(), 0L);
         return counts;
     }
 

hangtag-module-oms/hangtag-module-oms-biz/src/main/resources/mapper/saleorder/SaleOrderMapper.xml

@@ -11,12 +11,13 @@
         left join oms_brand brand on brand.id = a.brand_id
         <where>
             <if test="reqVO.billno != null and reqVO.billno != '' "> AND a.billno = #{reqVO.billno} </if>
+            <if test="reqVO.customerId != null "> AND a.customer_id = #{reqVO.customerId} </if>
             <if test="reqVO.bizdate != null "> AND a.bizdate between  #{reqVO.bizdate[0]} AND #{reqVO.bizdate[1]}</if>
             <if test="reqVO.confirmdate != null "> AND a.confirmdate between  #{reqVO.confirmdate[0]} AND #{reqVO.confirmdate[1}</if>
             <if test="reqVO.plansenddate != null "> AND a.plansenddate between  #{reqVO.plansenddate[0]} AND #{reqVO.plansenddate[1}</if>
             <if test="reqVO.phone != null and reqVO.phone != '' "> AND a.phone = #{reqVO.phone} </if>
             <if test="reqVO.remarks != null and reqVO.remarks != '' "> AND a.remarks = #{reqVO.remarks} </if>
-            <if test="reqVO.billStatus != null and reqVO.billStatus != '' "> AND a.bill_status = #{reqVO.billStatus} </if>
+            <if test="reqVO.billStatus != null and reqVO.billStatus != '' "> AND a.bill_status = #{reqVO.billStatus}  </if>
             <if test="reqVO.orderStatus != null and reqVO.orderStatus != '' "> AND a.order_status = #{reqVO.orderStatus} </if>
             <if test="reqVO.materialName != null and reqVO.materialName != '' "> AND (b.material_number LIKE CONCAT('%',#{reqVO.materialName},'%') OR b.material_name LIKE CONCAT('%',#{reqVO.materialName},'%')) </if>
             <if test="reqVO.customerName != null and reqVO.customerName != '' "> AND cus.name LIKE CONCAT('%',#{reqVO.customerName},'%') </if>

hangtag-ui/hangtag-ui-admin/src/views/oms/saleorder/index.vue

@@ -216,7 +216,7 @@
       <el-tab-pane
         v-for="item in tabsData"
         :key="item.type"
-        :label="(item.type !='All' && item.type !='E') ?item.name + '(' + item.count + ')':item.name"
+        :label="(item.type !='All' && item.type !='F') ?item.name + '(' + item.count + ')':item.name"
         :name="item.type"
       />
     </el-tabs>
@@ -420,6 +420,11 @@ const tabsData = ref([
     name: '已排产',
     type: 'E',
     count: 0
+  },
+  {
+    name: '已完成',
+    type: 'F',
+    count: 0
   }
 ])
 

hangtag-ui/hangtag-ui-front/src/locales/en.ts

@@ -509,6 +509,7 @@ export default {
     waitAudit:'Wait Audit',
     waitArrange:'Wait Arrange',
     planned:'Planned',
+    completed:'Completed',
     copy:'copy',
     edit:'edit',
     details:'details',

hangtag-ui/hangtag-ui-front/src/locales/zh-CN.ts

@@ -504,6 +504,7 @@ export default {
     waitAudit:'待审核',
     waitArrange:'待排产',
     planned:'已排产',
+    completed:'已完成',
     copy:'复制',
     edit:'编辑',
     details:'详情',

hangtag-ui/hangtag-ui-front/src/views/oms/saleorder/index.vue

@@ -174,7 +174,7 @@
       <el-tab-pane
         v-for="item in tabsData"
         :key="item.type"
-        :label="(item.type !='All' && item.type !='E') ?item.name + '(' + item.count + ')':item.name"
+        :label="(item.type !='All' && item.type !='F') ?item.name + '(' + item.count + ')':item.name"
         :name="item.type"
       />
     </el-tabs>
@@ -373,6 +373,11 @@ const tabsData = ref([
     name: t('billlist.planned'),
     type: 'E',
     count: 0
+  },
+  {
+    name: t('billlist.completed'),
+    type: 'F',
+    count: 0
   }
 ])