提交扫码枪相关程序

guoyujie

2025-05-21 d6db1b52d9ca9ee17fd5f28ad2b7ac9570f5a2a0

提交扫码枪相关程序

 north-glass-erp/northglass-erp/src/assets/main.css

@@ -7,8 +7,8 @@
  font-weight: normal;
  height: 100%;
  width: 100%;
  min-width: 1536px;
  min-height: 730px;
  /*min-width: 1536px;
  min-height: 730px;*/
}

a,

 north-glass-erp/northglass-erp/src/stores/sd/companySet/½ð»ªÌì³É.js

@@ -3,7 +3,7 @@
export default defineStore('companyInfo', {

    state: () => ({
        timeOut:true,//金华true，其他false，是否开启超时改变复选框状态
        timeOut:true,//金华true，其他false，是否开启发货超时改变复选框状态颜色
        connectMes:true,//常州,义乌true，其他false，显示订单报工转移是否启用
        companyName: '金华福喜天成玻璃有限公司',
        address:'浙江省金华市金东区曹宅镇工业功能区鹤岩街28号2号',
@@ -22,7 +22,7 @@
        selectOrderReviewShow:true, //订单首页加工单审核按钮是否显示
        productName:"product_name",
        decValue:2,//订单保留位数，天津3位,常州2位
        label:1,//标签类型
        label:1,//标签类型（自定义打印标签常州2，其他1）
        calculateType:1,//订单计算方式
        reportType:2,//报工是否查询样品订单2查询，1不查询
        qualityInsStatus:2,//跨工序质检审核，1不需要，2需要

 north-glass-erp/northglass-erp/src/views/system/app/appDownload.vue

@@ -1,5 +1,7 @@
<script setup>

document.querySelector('#app').style.minWidth = 'unset';
document.querySelector('#app').style.minHeight = 'unset';
</script>

<template>
@@ -11,5 +13,4 @@
</template>

<style scoped>

</style>

 north-glass-erp/src/main/java/com/example/erp/entity/sd/BasicData.java

@@ -2,11 +2,13 @@

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;

import java.time.LocalDate;

@Data
@TableName("sd.basic_data")
public class BasicData {
    @TableId(type = IdType.AUTO)
    private Integer id;

 north-glass-erp/src/main/java/com/example/erp/mapper/sd/OrderProcessDetailMapper.java

@@ -8,7 +8,6 @@
import org.apache.ibatis.annotations.Param;

import java.sql.Date;
import java.time.LocalDateTime;
import java.util.List;
import java.util.Map;

@@ -33,5 +32,5 @@

    String selectNextProcess(String processId, String technologyNumber, String thisProcess);

    List<Map<String, String>> selectShiftQuantitySv(String creatorId, String startDate,String endDate);
    List<Map<String, String>> selectShiftQuantitySv(String creatorId, String startDatetime, String endDatetime, String step);
}

 north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java

@@ -10,6 +10,7 @@
import com.example.erp.common.Constants;
import com.example.erp.dto.pp.OrderNumberTransferDTO;
import com.example.erp.entity.pp.*;
import com.example.erp.entity.sd.BasicData;
import com.example.erp.entity.sd.Order;
import com.example.erp.entity.sd.OrderDetail;
import com.example.erp.entity.sd.OrderProcessDetail;
@@ -19,10 +20,7 @@
import com.example.erp.mapper.mm.FinishedOperateLogMapper;
import com.example.erp.mapper.pp.*;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.example.erp.mapper.sd.OrderDetailMapper;
import com.example.erp.mapper.sd.OrderGlassDetailMapper;
import com.example.erp.mapper.sd.OrderMapper;
import com.example.erp.mapper.sd.OrderProcessDetailMapper;
import com.example.erp.mapper.sd.*;
import com.example.erp.mapper.userInfo.LogMapper;
import com.example.erp.service.sd.OrderProcessDetailService;
import com.example.erp.service.userInfo.LogService;
@@ -71,6 +69,7 @@
    private final RestTemplate restTemplate;
    private final PatchLogMapper patchLogMapper;
    private final ReworkMapper reworkMapper;
    private final BasicDateMapper basicDataMapper;


    /*public ReportingWorkService(ReportingWorkMapper reportingWorkMapper, BasicDateProduceMapper basicDateProduceMapper, DamageDetailsMapper damageDetailsMapper, ReportingWorkDetailMapper reportingWorkDetailMapper, OrderProcessDetailMapper orderProcessDetailMapper, OrderProcessDetailService orderProcessDetailService, OrderMapper orderMapper, FlowCardMapper flowCardMapper, LogService logService, LogMapper logMapper, OrderGlassDetailMapper orderGlassDetailMapper, SysErrorService sysErrorService, OrderDetailMapper orderDetailMapper, FinishedOperateLogMapper finishedOperateLogMapper, ReportingWorkTransferMapper reportingWorkTransferMapper) {
@@ -1163,7 +1162,9 @@
        date.add(startDate);
        date.add(endDate);
        Map<String, Object> result = new HashMap<>();
        result.put("data",orderProcessDetailMapper.selectShiftQuantitySv(creatorId, startDate, endDate));
        BasicData basicData = basicDataMapper
                .selectOne(new QueryWrapper<BasicData>().eq("basic_name", reportingWork.get("process")));
        result.put("data",orderProcessDetailMapper.selectShiftQuantitySv(creatorId, startDate, endDate,basicData.getNickname()));
        result.put("date",date);
        return result;
    }

 north-glass-erp/src/main/resources/mapper/sd/OrderProcessDetailMapper.xml

@@ -166,11 +166,12 @@
    </select>

    <select id="selectShiftQuantitySv">
        select CAST(concat(b.order_id,'/',a.order_number,'/',a.technology_number) as char ) as 'order_id',
        select * from(select CAST(concat(b.order_id,'/',a.order_number,'/',a.technology_number) as char ) as 'order_id',
               c.child_width,
               c.child_height,
               a.completed_quantity,
               a.breakage_quantity
               a.breakage_quantity,
               a.order_number
        from pp.reporting_work as b
        left join pp.reporting_work_detail as a
            on a.reporting_work_id = b.reporting_work_id
@@ -180,7 +181,10 @@
            and c.technology_number = a.technology_number
        where b.reviewed_state >=0
        and b.creator_id = #{creatorId}
        and UNIX_TIMESTAMP(b.reporting_work_time) BETWEEN UNIX_TIMESTAMP(#{startDate}) and UNIX_TIMESTAMP(#{endDate})
        order by b.id desc
        and UNIX_TIMESTAMP(b.reporting_work_time) BETWEEN UNIX_TIMESTAMP(#{startDatetime}) and UNIX_TIMESTAMP(#{endDatetime})
        order by b.id desc ) as e
        <if test="step != null and step != ''">
            group by e.order_number
        </if>
    </select>
</mapper>