Merge branch 'master' of http://62.234.61.92:3000/wjm/mec-cloud_IntelligentManufacturing_CLIENT

zkqy-business/src/main/java/com/zkqy/business/mapper/DragFormMapper.java

@@ -33,6 +33,13 @@ public interface DragFormMapper {
      */
     List<DragForm> selectDragFormList(DragForm dragForm);
 
+    /**
+     * 查询表单个数
+     * @param dragForm
+     * @return
+     */
+    int selectDragFormListCount(DragForm dragForm);
+
     /**
      * 新增动态表单
      *

zkqy-business/src/main/java/com/zkqy/business/mapper/DragTableGroupMapper.java

@@ -27,6 +27,15 @@ public interface DragTableGroupMapper {
      */
     public List<DragTableGroup> selectDragTableGroupList(DragTableGroup dragTableGroup);
 
+    /**
+     * 查询拖拽格组列表个数
+     *
+     * @param dragTableGroup 拖拽格组
+     * @return 拖拽格组集合 个数
+     */
+    public int selectDragTableGroupListCount(DragTableGroup dragTableGroup);
+
+
     /**
      * 新增拖拽格组
      *

zkqy-business/src/main/java/com/zkqy/business/mapper/DragTableMapper.java

@@ -28,6 +28,15 @@ public interface DragTableMapper
      */
     List<DragTable> selectDragTableList(DragTable dragTable);
 
+    /**
+     * 查询动态表格列表个数
+     *
+     * @param dragTable 动态表格
+     * @return 动态表格集合
+     */
+    int selectDragTableListCount(DragTable dragTable);
+
+
     /**
      * 新增动态表格
      * 

zkqy-business/src/main/java/com/zkqy/business/service/IDragFormService.java

@@ -33,6 +33,13 @@ public interface IDragFormService {
      */
     public List<DragForm> selectDragFormList(DragForm dragForm);
 
+    /**
+     * 查询表单个数
+     * @param dragForm
+     * @return
+     */
+    public int selectDragFormListCount(DragForm dragForm);
+
     /**
      * 新增动态表单
      *

zkqy-business/src/main/java/com/zkqy/business/service/IDragTableGroupService.java

@@ -30,7 +30,13 @@ public interface IDragTableGroupService {
      * @return 拖拽格组集合
      */
     public List<DragTableGroup> selectDragTableGroupList(DragTableGroup dragTableGroup);
-
+    /**
+     * 查询拖拽格组列表个数
+     *
+     * @param dragTableGroup 拖拽格组
+     * @return 拖拽格组集合
+     */
+    public int selectDragTableGroupListCount(DragTableGroup dragTableGroup);
     /**
      * 根据表格组key查询表格组信息
      *

zkqy-business/src/main/java/com/zkqy/business/service/IDragTableService.java

@@ -31,6 +31,13 @@ public interface IDragTableService
      */
      List<DragTable> selectDragTableList(DragTable dragTable);
 
+    /**
+     * 查询表格个数
+     * @param dragTable
+     * @return
+     */
+     public int selectDragTableListCount(DragTable dragTable);
+
     /**
      * 查询动态表格
      *

zkqy-business/src/main/java/com/zkqy/business/service/impl/DragFormServiceImpl.java

@@ -68,6 +68,15 @@ public class DragFormServiceImpl implements IDragFormService {
         return dragFormMapper.selectDragFormList(dragForm);
     }
 
+    /**
+     * 查询表单个数
+     * @param dragForm
+     * @return
+     */
+    public int selectDragFormListCount(DragForm dragForm) {
+        return dragFormMapper.selectDragFormListCount(dragForm);
+    }
+
     /**
      * 新增动态表单
      *

zkqy-business/src/main/java/com/zkqy/business/service/impl/DragTableGroupServiceImpl.java

@@ -87,6 +87,18 @@ public class DragTableGroupServiceImpl implements IDragTableGroupService {
         return dragTableGroupMapper.selectDragTableGroupList(dragTableGroup);
     }
 
+    /**
+     * 查询拖拽格组列表
+     *
+     * @param dragTableGroup 拖拽格组个数
+     * @return 拖拽格组
+     */
+    @Override
+    public int selectDragTableGroupListCount(DragTableGroup dragTableGroup)
+    {
+        return dragTableGroupMapper.selectDragTableGroupListCount(dragTableGroup);
+    }
+
     /**
      * 根据表格组key查询表格组信息
      * @param groupKey

zkqy-business/src/main/java/com/zkqy/business/service/impl/DragTableServiceImpl.java

@@ -70,6 +70,20 @@ public class DragTableServiceImpl implements IDragTableService {
         return dragTableMapper.selectDragTableList(dragTable);
     }
 
+
+    /**
+     * 查询表格个数
+     * @param dragTable
+     * @return
+     */
+    @Override
+    public int selectDragTableListCount(DragTable dragTable) {
+        return dragTableMapper.selectDragTableListCount(dragTable);
+    }
+
+
+
+
     /**
      * 根据tableKey查询动态表格
      * @param tableKey 唯一标识

zkqy-business/src/main/resources/mapper/dragmapper/DragFormMapper.xml

@@ -201,4 +201,9 @@
         from drag_form
         ORDER BY f_id desc LIMIT 1
     </select>
+
+    <select id="selectDragFormListCount" resultType="java.lang.Integer">
+        select count(f_id) from {DBNAME}.drag_form
+    </select>
+
 </mapper>

zkqy-business/src/main/resources/mapper/dragmapper/DragTableGroupMapper.xml

@@ -58,6 +58,9 @@
         <include refid="selectDragTableGroupVo"/>
         where  group_key=#{groupKey}
     </select>
+    <select id="selectDragTableGroupListCount" resultType="java.lang.Integer">
+        select count(id) from {DBNAME}.drag_table_group
+    </select>
 
 
     <insert id="insertDragTableGroup" parameterType="com.zkqy.business.entity.DragTableGroup">

zkqy-business/src/main/resources/mapper/dragmapper/DragTableMapper.xml

@@ -218,4 +218,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </select>
 
+    <select id="selectDragTableListCount" resultType="java.lang.Integer">
+        SELECT count(t_id) FROM {DBNAME}.drag_table
+    </select>
+
 </mapper>

zkqy-custom-business/src/main/java/com/zkqy/business/domain/SaleProducts.java

@@ -97,6 +97,18 @@ public class SaleProducts extends BaseEntity
     @Excel(name = "批号")
     private String lotNumber;
 
+    @Excel
+    private  String  onBoardState;
+
+
+    public String getOnBoardState() {
+        return onBoardState;
+    }
+
+
+    public void setOnBoardState(String onBoardState) {
+        this.onBoardState = onBoardState;
+    }
 
     public String getLotNumber() {
         return lotNumber;

zkqy-custom-business/src/main/java/com/zkqy/business/mapper/SaleProductsMapper.java

@@ -55,6 +55,11 @@ public interface SaleProductsMapper
      */
     public int updateSaleProducts(SaleProducts saleProducts);
 
+    /**
+     * 根据销售单号改产品状态
+     * @return
+     */
+    public int  updateSaleProductsBySaleOrderNo(SaleProducts saleProducts);
     /**
      * 批量修改线号
      * @param saleProducts

zkqy-custom-business/src/main/java/com/zkqy/business/service/impl/AmmunitionPlanInformationIntermediateTableServiceImpl.java

@@ -52,26 +52,31 @@ public class AmmunitionPlanInformationIntermediateTableServiceImpl implements IA
     @Transactional
     public int insertAmmunitionPlanInformationIntermediateTable(AmmunitionPlanInformationIntermediateTable ammunitionPlanInformationIntermediateTable)
     {
-//        List<SaleOrder> saleOrderList=new ArrayList<>();
-//        List<SaleProducts> saleProductsList=new ArrayList<>();
-//        //改批号，和产线号
-//        ammunitionPlanInformationIntermediateTable.getDetailsOfTheRefuelingPlans().forEach(item->{
-//            //改掉某个订单的批号
-//            SaleOrder saleOrder = new SaleOrder();
-//            //当初计划要存，业务员id,后期存的内容是订单号
-//            saleOrder.setSaleNo(item.getSalesmanId().toString());
-//            saleOrder.setLotNumber(item.getCurrentLotNumber().toString());
-//            saleOrderList.add(saleOrder);
-//            //改产品的线号
-//            SaleProducts saleProducts=new SaleProducts();
-//            saleProducts.setId(Long.valueOf(item.getProductId()));
-//            saleProducts.setProductionLineNo(item.getMachineId());
-//            saleProductsList.add(saleProducts);
-//        });
-//        //更新批号
-//        int i1 = saleOrderMapper.updateSaleOrderBatch(saleOrderList);
-//        //更新产线
-//        int i2 = saleProductsMapper.updateSaleProductBatch(saleProductsList);
+        List<SaleProducts> saleProductsList=new ArrayList<>();
+        //改批号，和产线号
+        ammunitionPlanInformationIntermediateTable.getDetailsOfTheRefuelingPlans().forEach(item->{
+            //改产品的线号
+            SaleProducts saleProducts=new SaleProducts();
+            saleProducts.setId(Long.valueOf(item.getProductId()));
+            saleProducts.setProductionLineNo(item.getMachineId());
+            if(item.getPlanStatus().equals("待机")){
+               item.setPlanStatus("0");
+            }
+            if(item.getPlanStatus().equals("上机")){
+                item.setPlanStatus("1");
+            }
+            if(item.getPlanStatus().equals("停机")){
+                item.setPlanStatus("2");
+            }
+            if(item.getPlanStatus().equals("完成")){
+                item.setPlanStatus("3");
+            }
+            saleProducts.setOnBoardState(item.getPlanStatus()); //产品状态
+            saleProducts.setLotNumber(item.getCurrentLotNumber());//批号
+            saleProductsList.add(saleProducts);
+        });
+        //更新产线
+        int i2 = saleProductsMapper.updateSaleProductBatch(saleProductsList);
         //插入计划数据
         int i3 = detailsOfTheRefuelingPlanMapper.insertBatchDetailsOfTheRefuelingPlan(ammunitionPlanInformationIntermediateTable.getDetailsOfTheRefuelingPlans());
         return i3;

zkqy-custom-business/src/main/java/com/zkqy/business/service/impl/DetailsOfTheRefuelingPlanServiceImpl.java

@@ -109,6 +109,23 @@ public class DetailsOfTheRefuelingPlanServiceImpl implements IDetailsOfTheRefuel
          *         //改这个产品用的那个产线
          *productsMapper.updateSaleProducts(saleProducts);
          */
+        SaleProducts saleProducts=new SaleProducts();
+        if(detailsOfTheRefuelingPlan.getPlanStatus().equals("待机")){
+            detailsOfTheRefuelingPlan.setPlanStatus("0");
+        }
+        if(detailsOfTheRefuelingPlan.getPlanStatus().equals("上机")){
+            detailsOfTheRefuelingPlan.setPlanStatus("1");
+        }
+        if(detailsOfTheRefuelingPlan.getPlanStatus().equals("停机")){
+            detailsOfTheRefuelingPlan.setPlanStatus("2");
+        }
+        if(detailsOfTheRefuelingPlan.getPlanStatus().equals("完成")){
+            detailsOfTheRefuelingPlan.setPlanStatus("3");
+        }
+        saleProducts.setSaleOrderNo(detailsOfTheRefuelingPlan.getSalesmanId());//合同号
+        saleProducts.setOnBoardState(detailsOfTheRefuelingPlan.getPlanStatus());//更新上机状态
+        //修改产品上机状态
+        productsMapper.updateSaleProductsBySaleOrderNo(saleProducts);
         return detailsOfTheRefuelingPlanMapper.updateDetailsOfTheRefuelingPlan(detailsOfTheRefuelingPlan);
     }
 

zkqy-custom-business/src/main/java/com/zkqy/business/service/impl/DetailsOfTheRefuelingPlanSpinningServiceImpl.java

@@ -176,6 +176,23 @@ public class DetailsOfTheRefuelingPlanSpinningServiceImpl implements IDetailsOfT
 //        saleProducts.setProductionLineNo(detailsOfTheRefuelingPlanSpinning.getMachineId());//产线编号
 //        //改这个产品用的那个产线
 //        saleProductsMapper.updateSaleProducts(saleProducts);
+        SaleProducts saleProducts=new SaleProducts();
+        if(detailsOfTheRefuelingPlanSpinning.getPlanStatus().equals("待机")){
+            detailsOfTheRefuelingPlanSpinning.setPlanStatus("0");
+        }
+        if(detailsOfTheRefuelingPlanSpinning.getPlanStatus().equals("上机")){
+            detailsOfTheRefuelingPlanSpinning.setPlanStatus("1");
+        }
+        if(detailsOfTheRefuelingPlanSpinning.getPlanStatus().equals("停机")){
+            detailsOfTheRefuelingPlanSpinning.setPlanStatus("2");
+        }
+        if(detailsOfTheRefuelingPlanSpinning.getPlanStatus().equals("完成")){
+            detailsOfTheRefuelingPlanSpinning.setPlanStatus("3");
+        }
+        saleProducts.setSaleOrderNo(detailsOfTheRefuelingPlanSpinning.getSalesmanId());//合同号
+        saleProducts.setOnBoardState(detailsOfTheRefuelingPlanSpinning.getPlanStatus());//更新上机状态
+        //修改产品上机状态
+        saleProductsMapper.updateSaleProductsBySaleOrderNo(saleProducts);
         return detailsOfTheRefuelingPlanSpinningMapper.updateDetailsOfTheRefuelingPlanSpinning(detailsOfTheRefuelingPlanSpinning);
     }
 
@@ -204,25 +221,29 @@ public class DetailsOfTheRefuelingPlanSpinningServiceImpl implements IDetailsOfT
     @Override
     public int insertDetailsOfTheRefuelingPlanSpinningBatch(List<DetailsOfTheRefuelingPlanSpinning> detailsOfTheRefuelingPlanSpinning) {
         //批量插入修改产线号和批号
-        List<SaleOrder> saleOrderList=new ArrayList<>();
         List<SaleProducts> saleProductsList=new ArrayList<>();
         //改批号，和产线号
         detailsOfTheRefuelingPlanSpinning.forEach(item->{
-            //改掉某个订单的批号
-            SaleOrder saleOrder = new SaleOrder();
-            //当初计划要存，业务员id,后期存的内容是订单号
-            saleOrder.setSaleNo(item.getSalesmanId().toString());//订单号
-            saleOrder.setLotNumber(item.getCurrentLotNumber().toString());//批号
-            saleOrderList.add(saleOrder);
             //改产品的线号,批号
             SaleProducts saleProducts=new SaleProducts();
             saleProducts.setId(Long.valueOf(item.getProductId()));
             saleProducts.setProductionLineNo(item.getMachineId());
             saleProducts.setLotNumber(item.getCurrentLotNumber().toString());//批号
+            if(item.getPlanStatus().equals("待机")){
+                item.setPlanStatus("0");
+            }
+            if(item.getPlanStatus().equals("上机")){
+                item.setPlanStatus("1");
+            }
+            if(item.getPlanStatus().equals("停机")){
+                item.setPlanStatus("2");
+            }
+            if(item.getPlanStatus().equals("完成")){
+                item.setPlanStatus("3");
+            }
+            saleProducts.setOnBoardState(item.getPlanStatus());//状态信息
             saleProductsList.add(saleProducts);
         });
-        //更新批号
-        int i1 = saleOrderMapper.updateSaleOrderBatch(saleOrderList);
         //更新产线
         int i2 = saleProductsMapper.updateSaleProductBatch(saleProductsList);
         return detailsOfTheRefuelingPlanSpinningMapper.insertBatchDetailsOfTheRefuelingPlanSpinning(detailsOfTheRefuelingPlanSpinning);

zkqy-custom-business/src/main/resources/mapper/business/SaleProductsMapper.xml

@@ -216,6 +216,37 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </update>
 
+    <update id="updateSaleProductsBySaleOrderNo" parameterType="com.zkqy.business.domain.SaleProducts">
+        update {DBNAME}.sale_products
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="saleProductNo != null">sale_product_no = #{saleProductNo},</if>
+            <if test="productNo != null">product_no = #{productNo},</if>
+            <if test="productName != null">product_name = #{productName},</if>
+            <if test="productNumber != null">product_number = #{productNumber},</if>
+            <if test="productWeight != null">product_weight = #{productWeight},</if>
+            <if test="productUnitPrice != null">product_unit_price = #{productUnitPrice},</if>
+            <if test="productAmounts != null">product_amounts = #{productAmounts},</if>
+            <if test="productNotes != null">product_notes = #{productNotes},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="createById != null">create_by_id = #{createById},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateById != null">update_by_id = #{updateById},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+            <if test="taskProcessKey != null">task_process_key = #{taskProcessKey},</if>
+            <if test="taskNodeKey != null">task_node_key = #{taskNodeKey},</if>
+            <if test="processKey != null">process_key = #{processKey},</if>
+            <if test="status != null">status = #{status},</if>
+            <if test="productionLineNo != null">production_line_no = #{productionLineNo},</if>
+            <if test="sliceType != null">slice_type = #{sliceType},</if>
+            <if test="colourNumber != null">colour_number = #{colourNumber},</if>
+            <if test="onBoardState != null">on_board_state = #{onBoardState},</if>
+        </trim>
+        where sale_order_no = #{saleOrderNo}
+    </update>
+
     <delete id="deleteSaleProductsById" parameterType="Long">
         delete from sale_products where id = #{id}
     </delete>
@@ -231,7 +262,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             update {DBNAME}.sale_products
             <set>
                 production_line_no=#{item.productionLineNo},
-                lot_number=#{item.lotNumber}
+                lot_number=#{item.lotNumber},
+                on_board_state=#{item.onBoardState}
             </set>
             where id = #{item.id}
         </foreach>

zkqy-framework/src/main/java/com/zkqy/framework/manager/factory/AsyncFactory.java

@@ -65,6 +65,7 @@ public class AsyncFactory
                 logininfor.setBrowser(browser);
                 logininfor.setOs(os);
                 logininfor.setMsg(message);
+                logininfor.setWhichApplication("2");
                 // 日志状态
                 if (StringUtils.equalsAny(status, Constants.LOGIN_SUCCESS, Constants.LOGOUT, Constants.REGISTER))
                 {
@@ -114,6 +115,8 @@ public class AsyncFactory
                 logininfor.setMsg(message);
                 // 增加租户标识
                 logininfor.setTenantId(tenantId);
+                // 增加是客户端的登录
+                logininfor.setWhichApplication("2");
                 // 日志状态
                 if (StringUtils.equalsAny(status, Constants.LOGIN_SUCCESS, Constants.LOGOUT, Constants.REGISTER))
                 {

zkqy-process-execution/src/main/java/com/zkqy/execution/produce/dispersed/mapper/BpmProcessMapper.java

@@ -1,8 +1,10 @@
 package com.zkqy.execution.produce.dispersed.mapper;
 
 import com.zkqy.execution.produce.dispersed.entity.BpmProcess;
+import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 流程定义Mapper接口
@@ -10,6 +12,7 @@ import java.util.List;
  * @author hzh
  * @date 2023-10-10
  */
+@Mapper
 public interface BpmProcessMapper 
 {
     /**
@@ -71,4 +74,10 @@ public interface BpmProcessMapper
      * @return
      */
     BpmProcess selectBpmProcessByProcessKey(String processKey);
+
+    /**
+     * 查询流程统计信息
+     * @return
+     */
+    List<Map> selectBpmProcessStatistics();
 }

zkqy-process-execution/src/main/java/com/zkqy/execution/produce/dispersed/service/IBpmProcessService.java

@@ -6,6 +6,7 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 流程定义Service接口
@@ -30,6 +31,11 @@ public interface IBpmProcessService {
      */
     public List<BpmProcess> selectBpmProcessList(BpmProcess bpmProcess);
 
+    /**
+     * 查询流程统计信息
+     * @return
+     */
+    public List<Map> selectBpmProcessStatistics();
     /**
      * 新增流程定义
      *

zkqy-process-execution/src/main/java/com/zkqy/execution/produce/dispersed/service/impl/BpmProcessServiceImpl.java

@@ -29,6 +29,7 @@ import java.nio.file.Paths;
 import java.nio.file.StandardCopyOption;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
@@ -68,6 +69,16 @@ public class BpmProcessServiceImpl implements IBpmProcessService {
         return bpmProcessMapper.selectBpmProcessList(bpmProcess);
     }
 
+    /**
+     * 查询流程统计信息
+     * @param
+     * @return
+     */
+    @Override
+    public List<Map> selectBpmProcessStatistics() {
+        return bpmProcessMapper.selectBpmProcessStatistics();
+    }
+
     /**
      * 新增流程定义
      *

zkqy-process-execution/src/main/resources/mapper/bpm/dispersed/BpmProcessMapper.xml

@@ -161,4 +161,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectBpmProcessVo"/>
         where process_key = #{processKey} and process_version = 0 and del_flag = '0'
     </select>
+
+    <select id="selectBpmProcessStatistics" resultType="java.util.Map">
+        SELECT
+            count( process_id ) AS `value`,
+            IF
+            ( process_type = '1', "审批流", "工艺流" ) AS `name`
+        FROM
+            {DBNAME}.bpm_process
+        GROUP BY
+            process_type
+    </select>
 </mapper>

zkqy-system/src/main/java/com/zkqy/system/domain/SysLogininfor.java

@@ -57,6 +57,16 @@ public class SysLogininfor extends BaseEntity
      */
     private Long tenantId;
 
+    private  String whichApplication;
+
+    public String getWhichApplication() {
+        return whichApplication;
+    }
+
+    public void setWhichApplication(String whichApplication) {
+        this.whichApplication = whichApplication;
+    }
+
     public Long getInfoId()
     {
         return infoId;

zkqy-system/src/main/java/com/zkqy/system/mapper/SysLogininforMapper.java

@@ -1,7 +1,10 @@
 package com.zkqy.system.mapper;
 
 import java.util.List;
+import java.util.Map;
+
 import com.zkqy.system.domain.SysLogininfor;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 系统访问日志情况信息 数据层
@@ -25,6 +28,9 @@ public interface SysLogininforMapper
      */
     public List<SysLogininfor> selectLogininforList(SysLogininfor logininfor);
 
+    public List<Map> getLoginInformationStatistics(@Param("tenantId")String tenantId,@Param("whichApplication") String whichApplication);
+
+
     /**
      * 批量删除系统登录日志
      * 

zkqy-system/src/main/java/com/zkqy/system/mapper/SysOperLogMapper.java

@@ -1,6 +1,9 @@
 package com.zkqy.system.mapper;
 
 import java.util.List;
+import java.util.Map;
+
+import com.zkqy.system.domain.SysActivationCodeLog;
 import com.zkqy.system.domain.SysOperLog;
 
 /**
@@ -45,4 +48,11 @@ public interface SysOperLogMapper
      * 清空操作日志
      */
     public void cleanOperLog();
+
+
+    /**
+     * 根据租户id查询租户下的
+     * @return
+     */
+    List<Map> selectOperationInformationStatisticsTenantId(Long tenantId);
 }

zkqy-system/src/main/java/com/zkqy/system/service/ISysActivationCodeLogService.java

@@ -47,4 +47,8 @@ public interface ISysActivationCodeLogService
      * 清空操作日志
      */
     public void cleanActivationCodeLog();
+
+
+
+
 }

zkqy-system/src/main/java/com/zkqy/system/service/ISysOperLogService.java

@@ -1,6 +1,8 @@
 package com.zkqy.system.service;
 
 import java.util.List;
+import java.util.Map;
+
 import com.zkqy.system.domain.SysOperLog;
 
 /**
@@ -45,4 +47,11 @@ public interface ISysOperLogService
      * 清空操作日志
      */
     public void cleanOperLog();
+
+    /**
+     * 根据租户id查询对应租户下的所有操作日志
+     * @param tenantId
+     * @return
+     */
+    List<Map> selectOperationInformationStatistics(Long tenantId);
 }

zkqy-system/src/main/java/com/zkqy/system/service/impl/ISysActivationCodeLogServiceImpl.java

@@ -67,4 +67,7 @@ public class ISysActivationCodeLogServiceImpl implements ISysActivationCodeLogSe
     public void cleanActivationCodeLog() {
         sysActivationCodeLogMapper.cleanActivationCodeLog();
     }
+
+
+
 }

zkqy-system/src/main/java/com/zkqy/system/service/impl/SysLogininforServiceImpl.java

@@ -1,13 +1,16 @@
 package com.zkqy.system.service.impl;
 
 import java.util.List;
+import java.util.Map;
 
 import com.zkqy.common.utils.SecurityUtils;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.zkqy.system.domain.SysLogininfor;
 import com.zkqy.system.mapper.SysLogininforMapper;
 import com.zkqy.system.service.ISysLogininforService;
+import org.springframework.web.bind.annotation.RequestParam;
 
 /**
  * 系统访问日志情况信息 服务层处理
@@ -20,6 +23,11 @@ public class SysLogininforServiceImpl implements ISysLogininforService {
     @Autowired
     private SysLogininforMapper logininforMapper;
 
+//    @Override
+    public List<Map> getLoginInformationStatistics(SysLogininfor logininfor) {
+       return logininforMapper.getLoginInformationStatistics( logininfor.getTenantId().toString(),logininfor.getWhichApplication());
+    }
+
     /**
      * 新增系统登录日志
      *

zkqy-system/src/main/java/com/zkqy/system/service/impl/SysOperLogServiceImpl.java

@@ -1,6 +1,9 @@
 package com.zkqy.system.service.impl;
 
 import java.util.List;
+import java.util.Map;
+
+import com.zkqy.system.domain.SysActivationCodeLog;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.zkqy.system.domain.SysOperLog;
@@ -73,4 +76,14 @@ public class SysOperLogServiceImpl implements ISysOperLogService
     {
         operLogMapper.cleanOperLog();
     }
+
+    /**
+     * 根据租户id查询本租户下的所有操作信息
+     * @param tenantId
+     * @return
+     */
+    @Override
+    public List<Map> selectOperationInformationStatistics(Long tenantId) {
+        return operLogMapper.selectOperationInformationStatisticsTenantId(tenantId);
+    }
 }

zkqy-system/src/main/resources/mapper/system/SysLogininforMapper.xml

@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zkqy.system.mapper.SysLogininforMapper">
 
-	<resultMap type="SysLogininfor" id="SysLogininforResult">
+	<resultMap type="com.zkqy.system.domain.SysLogininfor" id="SysLogininforResult">
 		<id     property="infoId"        column="info_id"           />
 		<result property="userName"      column="user_name"         />
 		<result property="status"        column="status"            />
@@ -17,12 +17,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="tenantId"     column="tenant_id"        />
 	</resultMap>
 
-	<insert id="insertLogininfor" parameterType="SysLogininfor">
-		insert into sys_logininfor (user_name, status, ipaddr, login_location, browser, os, msg, login_time,tenant_id)
-		values (#{userName}, #{status}, #{ipaddr}, #{loginLocation}, #{browser}, #{os}, #{msg}, sysdate(),#{tenantId})
+	<insert id="insertLogininfor" parameterType="com.zkqy.system.domain.SysLogininfor">
+		insert into sys_logininfor (user_name, status, ipaddr, login_location, browser, os, msg, login_time,tenant_id, which_application)
+		values (#{userName}, #{status}, #{ipaddr}, #{loginLocation}, #{browser}, #{os}, #{msg}, sysdate(),#{tenantId},#{whichApplication})
 	</insert>
 	
-	<select id="selectLogininforList" parameterType="SysLogininfor" resultMap="SysLogininforResult">
+	<select id="selectLogininforList" parameterType="com.zkqy.system.domain.SysLogininfor" resultMap="SysLogininforResult">
         select info_id, user_name, ipaddr, login_location, browser, os, status, msg, login_time,tenant_id from
         sys_logininfor
         <where>
@@ -47,8 +47,100 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         order by info_id desc
     </select>
-	
-	<delete id="deleteLogininforByIds" parameterType="Long">
+    <select id="getLoginInformationStatistics" resultType="map">
+        SELECT
+        d.date AS login_date,
+        COUNT( l.info_id ) AS daily_login_count
+        FROM
+        (
+        SELECT
+        CURDATE() - INTERVAL seq DAY AS date
+        FROM
+        (
+        SELECT
+        @ROW := @ROW + 1 AS seq
+        FROM
+        (
+        SELECT
+        0 UNION ALL
+        SELECT
+        1 UNION ALL
+        SELECT
+        3 UNION ALL
+        SELECT
+        4 UNION ALL
+        SELECT
+        5 UNION ALL
+        SELECT
+        6 UNION ALL
+        SELECT
+        6 UNION ALL
+        SELECT
+        7 UNION ALL
+        SELECT
+        8 UNION ALL
+        SELECT
+        9
+        ) t1,
+        (
+        SELECT
+        0 UNION ALL
+        SELECT
+        1 UNION ALL
+        SELECT
+        3 UNION ALL
+        SELECT
+        4 UNION ALL
+        SELECT
+        5 UNION ALL
+        SELECT
+        6 UNION ALL
+        SELECT
+        6 UNION ALL
+        SELECT
+        7 UNION ALL
+        SELECT
+        8 UNION ALL
+        SELECT
+        9
+        ) t2,
+        (
+        SELECT
+        0 UNION ALL
+        SELECT
+        1 UNION ALL
+        SELECT
+        3 UNION ALL
+        SELECT
+        4 UNION ALL
+        SELECT
+        5 UNION ALL
+        SELECT
+        6 UNION ALL
+        SELECT
+        6 UNION ALL
+        SELECT
+        7 UNION ALL
+        SELECT
+        8 UNION ALL
+        SELECT
+        9
+        ) t3,
+        ( SELECT @ROW := 0 ) r
+        ) v
+        WHERE
+           <![CDATA[seq <= 30 ]]>
+        ) d
+        LEFT JOIN sys_logininfor l ON DATE( l.login_time ) = d.date
+        AND l.tenant_id =#{tenantId}
+        AND l.which_application =#{whichApplication}
+        GROUP BY
+        d.date
+        ORDER BY
+        d.date;
+    </select>
+
+    <delete id="deleteLogininforByIds" parameterType="Long">
         delete from sys_logininfor where info_id in
         <foreach collection="array" item="infoId" open="(" separator="," close=")">
             #{infoId}

zkqy-system/src/main/resources/mapper/system/SysOperLogMapper.xml

@@ -80,8 +80,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<include refid="selectOperLogVo"/>
 		where oper_id = #{operId}
 	</select>
+    <select id="selectOperationInformationStatisticsTenantId"
+            resultType="map" parameterType="long">
+		SELECT oper_name,oper_ip FROM `sys_oper_log` where tenant_id=#{tenantId}
+	</select>
 
-	<update id="cleanOperLog">
+    <update id="cleanOperLog">
         truncate table sys_oper_log
     </update>
 

zkqy-ui/src/views/orderMange/planTable/fangsi.vue

@@ -84,7 +84,7 @@
             </el-table-column>
             <el-table-column prop="currentLotNumber" label="批号" header-align="center" align="center">
               <template v-slot:default="scope">
-                <el-input v-if="scope.row.isEditing"   v-model="scope.row.currentLotNumber" placeholder="请输入批号" @blur.stop.prevent="handleInputBlur(scope.row)">></el-input>
+                <el-input v-if="scope.row.isEditing" :disabled="isDisabled"  v-model="scope.row.currentLotNumber" placeholder="请输入批号" @blur.stop.prevent="handleInputBlur(scope.row)">></el-input>
                 <span v-else>{{ scope.row.currentLotNumber }}</span>
               </template>
             </el-table-column>
@@ -116,7 +116,7 @@
                 </el-select>
               </template>
             </el-table-column>
-            <el-table-column label="操作">
+            <el-table-column label="操作" align="center">
               <template slot-scope="scope">
                 <el-button
                   size="mini"
@@ -178,14 +178,14 @@
             <el-table-column prop="currentSpecification" label="规格" header-align="center" align="center">
               <template v-slot:default="scope">
                 <!-- 如果当前行正在编辑，则显示输入框 -->
-                <el-input v-if="scope.row.isEditing" v-model="scope.row.currentSpecification" placeholder="请输入规格" @blur.stop.prevent="handleInputBlur(scope.row)">></el-input>
+                <el-input v-if="scope.row.isEditing" :disabled="false" v-model="scope.row.currentSpecification" placeholder="请输入规格" @blur.stop.prevent="handleInputBlur(scope.row)">></el-input>
                 <!-- 否则显示普通文本 -->
                 <span v-else>{{ scope.row.currentSpecification }}</span>
               </template>
             </el-table-column>
             <el-table-column prop="currentLotNumber" label="批号" header-align="center" align="center">
               <template v-slot:default="scope">
-                <el-input v-if="scope.row.isEditing"  v-model="scope.row.currentLotNumber" placeholder="请输入批号" @blur.stop.prevent="handleInputBlur(scope.row)">></el-input>
+                <el-input v-if="scope.row.isEditing"   v-model="scope.row.currentLotNumber" placeholder="请输入批号" @blur.stop.prevent="handleInputBlur(scope.row)">></el-input>
                 <span v-else>{{ scope.row.currentLotNumber }}</span>
               </template>
             </el-table-column>
@@ -223,7 +223,7 @@
                 </el-select>
               </template>
             </el-table-column>
-            <el-table-column label="操作">
+            <el-table-column label="操作" align="center">
               <template v-slot:default="scope">
                 <el-button
                   size="mini"
@@ -253,6 +253,8 @@ import {
 export default {
   data() {
     return {
+      //
+      isDisabled:true,
       //选中的是那个车间
       tableData:[],
       form: {
@@ -371,6 +373,13 @@ export default {
           row.currentColorCode = this.materiel.materieEncoding+"("+this.materiel.materieColorNumber+")";
         }
       });
+      //isDisabled(有批号就用，没批号就自己输入)
+      if(this.product.lotNumber!=undefined&&this.product.lotNumber!=""){
+        row.currentLotNumber=this.product.lotNumber;
+        this.isDisabled=true;
+      }else {
+        this.isDisabled=false;
+      }
       //产品规格
       row.currentSpecification= this.product.productSpecifications;
       //合同号--销售单编号（以前打算存的是业务员信息后来存的是销售单编号）

zkqy-ui/src/views/orderMange/planTable/fankuang.vue

@@ -84,7 +84,7 @@
             </el-table-column>
             <el-table-column prop="currentLotNumber" label="批号" header-align="center" align="center">
               <template v-slot:default="scope">
-                <el-input v-if="scope.row.isEditing" disabled="disabled" v-model="scope.row.currentLotNumber" placeholder="请输入批号" @blur.stop.prevent="handleInputBlur(scope.row)">></el-input>
+                <el-input v-if="scope.row.isEditing" :disabled="isDisabled" v-model="scope.row.currentLotNumber" placeholder="请输入批号" @blur.stop.prevent="handleInputBlur(scope.row)">></el-input>
                 <span v-else>{{ scope.row.currentLotNumber }}</span>
               </template>
             </el-table-column>
@@ -116,7 +116,7 @@
                 </el-select>
               </template>
             </el-table-column>
-            <el-table-column label="操作">
+            <el-table-column label="操作" align="center">
               <template slot-scope="scope">
                 <el-button
                   size="mini"
@@ -178,7 +178,7 @@
             <el-table-column prop="weishu" label="位数" header-align="center" align="center">
               <template v-slot:default="scope">
                 <!-- 如果当前行正在编辑，则显示输入框 -->
-                <el-input v-if="scope.row.isEditing"  disabled="disabled"  v-model="scope.row.currentColorCode" placeholder="请输入色号" @blur.stop.prevent="handleInputBlur(scope.row)" ></el-input>
+                <el-input v-if="scope.row.isEditing"   v-model="scope.row.currentColorCode" placeholder="请输入色号" @blur.stop.prevent="handleInputBlur(scope.row)" ></el-input>
                 <!-- 否则显示普通文本 -->
                 <span v-else>{{ scope.row.currentColorCode }}</span>
               </template>
@@ -193,7 +193,7 @@
             </el-table-column>
             <el-table-column prop="currentLotNumber" label="批号" header-align="center" align="center">
               <template v-slot:default="scope">
-                <el-input v-if="scope.row.isEditing" disabled="disabled" v-model="scope.row.currentLotNumber" placeholder="请输入批号" @blur.stop.prevent="handleInputBlur(scope.row)">></el-input>
+                <el-input v-if="scope.row.isEditing" v-model="scope.row.currentLotNumber" placeholder="请输入批号" @blur.stop.prevent="handleInputBlur(scope.row)">></el-input>
                 <span v-else>{{ scope.row.currentLotNumber }}</span>
               </template>
             </el-table-column>
@@ -231,7 +231,7 @@
                 </el-select>
               </template>
             </el-table-column>
-            <el-table-column label="操作">
+            <el-table-column label="操作" align="center">
               <template v-slot:default="scope">
                 <el-button
                   size="mini"
@@ -260,6 +260,8 @@ import {
 export default {
   data() {
     return {
+      //
+      isDisabled:true,
       //选中的是那个车间
       tableData:[],
       form: {
@@ -365,8 +367,7 @@ export default {
       this.product = this.productsInfo.find(product => product.id === selectedProduct);
       //选择的那个产品
       this.form.product=selectedProduct;
-      //批次
-      row.currentLotNumber=this.product.lotNumber;
+
       //通过母粒编码查询到对应的母粒信息
       let queryParams = {
         "materielCode": this.product.colourNumber
@@ -379,6 +380,13 @@ export default {
           row.currentColorCode = this.materiel.materieEncoding+"("+this.materiel.materieColorNumber+")";
         }
       });
+      //isDisabled(有批号就用，没批号就自己输入)
+      if(this.product.lotNumber!=undefined&&this.product.lotNumber!=""){
+        row.currentLotNumber=this.product.lotNumber;
+        this.isDisabled=true;
+      }else {
+        this.isDisabled=false;
+      }
       //产品规格
       row.currentSpecification= this.product.productSpecifications;
       //合同号--销售单编号（以前打算存的是业务员信息后来存的是销售单编号）

zkqy-ui/src/views/orderMange/planTable/index.vue

@@ -93,7 +93,7 @@
             </el-table-column>
             <el-table-column prop="currentLotNumber" label="批号"  header-align="center" align="center">
               <template v-slot:default="scope">
-                <el-input v-if="scope.row.isEditing"  disabled="disabled" v-model="scope.row.currentLotNumber" placeholder="请输入批号" @blur.stop.prevent="handleInputBlur(scope.row)">></el-input>
+                <el-input v-if="scope.row.isEditing"  :disabled="isDisabled" v-model="scope.row.currentLotNumber" placeholder="请输入批号" @blur.stop.prevent="handleInputBlur(scope.row)">></el-input>
                 <span v-else>{{ scope.row.currentLotNumber }}</span>
               </template>
             </el-table-column>
@@ -364,7 +364,8 @@
 
             <el-table-column prop="currentLotNumber" label="批号" header-align="center" align="center">
               <template v-slot:default="scope">
-                <el-input v-if="scope.row.isEditing" disabled="disabled"  v-model="scope.row.currentLotNumber" placeholder="请输入批号" @blur.stop.prevent="handleInputBlur(scope.row)">></el-input>
+
+                <el-input v-if="scope.row.isEditing" :disabled="isDisabled"  v-model="scope.row.currentLotNumber" placeholder="请输入批号" @blur.stop.prevent="handleInputBlur(scope.row)">></el-input>
                 <span v-else>{{ scope.row.currentLotNumber }}</span>
               </template>
             </el-table-column>
@@ -564,6 +565,7 @@ export default {
       //选中的是那个车间
       selectedWorkshop:"南车间",
       tableData:[],
+      isDisabled:true,
       form: {
         product:"",
       },
@@ -771,7 +773,6 @@ export default {
       //选择的那个销售产品
       this.product = this.productsInfo.find(product => product.id === selectedProduct);
       this.form.product=selectedProduct;
-      row.currentLotNumber=this.product.lotNumber;
       //通过母粒编码查询到对应的母粒信息
       let queryParams = {
         "materielCode": this.product.colourNumber
@@ -784,9 +785,16 @@ export default {
           row.currentColorCode = this.materiel.materieEncoding+"("+this.materiel.materieColorNumber+")";
         }
       });
+      //isDisabled(有批号就用，没批号就自己输入)
+      if(this.product.lotNumber!=undefined&&this.product.lotNumber!=""){
+        row.currentLotNumber=this.product.lotNumber;
+        this.isDisabled=true;
+      }else {
+        this.isDisabled=false;
+      }
       //产品规格
       row.currentSpecification= this.product.productSpecifications;
-      //合同号--销售单编号（以前打算存的是业务员信息后来存的是销售单编号）
+      //销售单编号（以前打算存的是业务员信息后来存的是销售单编号）
       row.salesmanId=this.product.saleOrderNo;
     },
     // 新增计划产品信息

zkqy-ui/src/views/orderMange/planTable/luotong.vue

@@ -116,7 +116,7 @@
                 </el-select>
               </template>
             </el-table-column>
-            <el-table-column label="操作">
+            <el-table-column label="操作" align="center">
               <template slot-scope="scope">
                 <el-button
                   size="mini"
@@ -193,7 +193,7 @@
             </el-table-column>
             <el-table-column prop="currentLotNumber" label="批号" header-align="center" align="center">
               <template v-slot:default="scope">
-                <el-input v-if="scope.row.isEditing" disabled="disabled"  v-model="scope.row.currentLotNumber" placeholder="请输入批号" @blur.stop.prevent="handleInputBlur(scope.row)">></el-input>
+                <el-input v-if="scope.row.isEditing" :disabled="isDisabled"  v-model="scope.row.currentLotNumber" placeholder="请输入批号" @blur.stop.prevent="handleInputBlur(scope.row)">></el-input>
                 <span v-else>{{ scope.row.currentLotNumber }}</span>
               </template>
             </el-table-column>
@@ -231,7 +231,7 @@
                 </el-select>
               </template>
             </el-table-column>
-            <el-table-column label="操作">
+            <el-table-column label="操作" align="center">
               <template v-slot:default="scope">
                 <el-button
                   size="mini"
@@ -262,6 +262,8 @@ export default {
     return {
       //选中的是那个车间
       tableData:[],
+      //默认是禁用
+      isDisabled:true,
       form: {
         product:"",
       },
@@ -364,8 +366,6 @@ export default {
       //选择的那个销售产品
       this.product = this.productsInfo.find(product => product.id === selectedProduct);
       this.form.product=selectedProduct;
-      //批次
-      row.currentLotNumber=this.product.lotNumber;
       //通过母粒编码查询到对应的母粒信息
       let queryParams = {
         "materielCode": this.product.colourNumber
@@ -378,6 +378,13 @@ export default {
           row.currentColorCode = this.materiel.materieEncoding+"("+this.materiel.materieColorNumber+")";
         }
       });
+      //isDisabled(有批号就用，没批号就自己输入)
+      if(this.product.lotNumber!=undefined&&this.product.lotNumber!=""){
+        row.currentLotNumber=this.product.lotNumber;
+        this.isDisabled=true;
+      }else {
+        this.isDisabled=false;
+      }
       //产品规格
       row.currentSpecification= this.product.productSpecifications;
       //合同号--销售单编号（以前打算存的是业务员信息后来存的是销售单编号）

zkqy-ui/src/views/orderMange/purchase/listInfoTwo.vue

@@ -871,7 +871,8 @@ export default {
       this.particularsOfSalesNote.purchaseLotNumber=row.purchaseLotNumber
       this.particularsOfSalesNote.purchaseTiem=row.purchaseCreateTime
       this.viewPurchaseOrderDetailsShow=true;
-      getPurchaseInfo({"purchaseId":row.purchaseId}).then(resp=>{
+      // console.log(row,"行数据");
+      getPurchaseInfo({"purchaseId":row.purchaseSerialNumber}).then(resp=>{
         this.purchaseInfo=resp.data
         console.log(this.purchaseInfo)
       })