Merge branch 'master' of http://bore.pub:10439/r/ERP_override

廖井涛

2024-08-12 b425ceaf0691b548f0e837e002a23fc2968548ad

Merge branch 'master' of http://bore.pub:10439/r/ERP_override

 north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue

@@ -135,7 +135,9 @@


const handleGetQRCode = async () => {
  console.log(produceList.value)
  for (let i = 0; i < produceList.value.length; i++) {

    const technologyNumber = produceList.value[i].detail[0].technologyNumber.toString(); // 转换为字符串以便处理每个字符
    produceList.value[i].detail[0]["qrcodeList"] = []; // 初始化一个空数组用来存储 QR Code


 north-glass-erp/northglass-erp/src/components/pp/TagStyle.vue

@@ -33,7 +33,7 @@
  alType:'order.alType',
  customerBatch:'order.customerBatch',
  processingNote:'order.processingNote',
  remarks:'product.msg.remarks',
  remarks:'产品备注',
  customerAbbreviation:'customer.customerAbbreviation',
  productAbbreviation:'product.msg.productAbbreviation',
  processId:'processCard.processId',

 north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue

@@ -533,7 +533,6 @@
                }

              })
              console.log(dataList)
            }
          }
          break
@@ -763,7 +762,9 @@
    if(user.user.address!==null && user.user.address!==''){
      titleUploadData.value.thisProcess = user.user.address
      titleUploadData.value.teamsGroupsName = user.user.userName
      groupChangeProcess.value = true
      if (user.user.address!=='技术部多曲'){
        groupChangeProcess.value = true
      }
      gridOptions.toolbarConfig.buttons[1].visible=false
    }

@@ -1030,7 +1031,6 @@
  let technologyStr = result[2];

  let reportType= company.reportType
  console.log(reportType)
  request.post(`/reportingWork/addSelectLastWork/${processIdStr}/${technologyStr}/${process}/${reportType}`).then((res) => {
    if (res.code == 200) {
      if(res.data.data==null){

 north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue

@@ -23,7 +23,7 @@
let errorAreaVisible = ref(false)
let otherMoneyVisible = ref(false)
let sizeCheckVisible = ref(false)
const maxTableLen =ref(200)
const maxTableLen =ref(500)
let errorArea = ref(0.4)
const userStore = useUserInfoStore()
const company = companyInfo()
@@ -1213,7 +1213,7 @@
//误差面积计算方法
const errorAreaComputed = () => {
  const regex = /^(0(\.\d{1,2})?|([1-9]\d{0,4})(\.\d{1,2})?|99999(\.9{1,2})?)$/
  if (!regex.test(errorArea.value)) {
  if (!regex.test(errorArea.value.toString())) {
    ElMessage.warning(t('basicData.msg.range99999Dec2'))
    return
  }

 north-glass-erp/northglass-erp/src/views/system/user/UserList.vue

@@ -124,6 +124,7 @@
}

const roleUpdate = () => {
  userRole.value.roles = [userRole.value.roles]
  request.post('userRole/updateUserRole',userRole.value).then(res=>{
    if(res.code==200 && res.data===true){
      ElMessage.success(t('basicData.msg.saveSuccess'))
@@ -171,11 +172,11 @@
        :before-close="handleClose"
    >
      <span>
        <el-checkbox v-for="(item) in roleList"
        <el-radio v-for="(item) in roleList"
                     :label="item.id"
                     v-model="userRole.roles" >
          {{item.role}}
        </el-checkbox>
        </el-radio>
      </span>
      <template #footer>
      <span class="dialog-footer">

 north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java

@@ -151,4 +151,6 @@
    Integer printAddSortCountMp(String processId, Integer orderNumber, Integer technologyNumber, Integer sort, String process);

    Boolean printUpdateSortMp(String processId, Integer orderNumber, Integer technologyNumber, Integer sort, String process);

    List<Map<String, String>> getPrimaryListLimt(String processId, String technologyNumber, String glassChild, String process);
}

 north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportingWorkMapper.java

@@ -24,7 +24,7 @@

    List<Map<String,String>> SelectTechnologicalNumMp(String processIdStr, String technologyStr, String process, String reportType);

    List<Map<String,String>> SelectReworlDetailMp(String processIdStr, String technologyStr, String process);
    List<Map<String,String>> SelectReworlDetailMp(String processIdStr, String technologyStr, String process, String previousProcess);

    List<Map<String,String>> SelectProcessMp();


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

@@ -266,15 +266,19 @@
                //流程卡表头表尾数据
                //是否传入合并层数
                if (printMerge.equals("")||printMerge.equals("null") ){
                    itemmap.put("detail", flowCardMapper.getPrimaryList(flowCard.getProcessId(), String.valueOf(flowCard.getTechnologyNumber()),flowCard.getGlassChild(),flowCard.getProcess()));
                    //是否包含切割
                    boolean containsCutting = flowCard.getProcess().contains("切割");
                    if(String.valueOf(flowCard.getTechnologyNumber()).length()>1 && containsCutting){
                        List<Map<String, Object>> detailList = flowCardMapper.getDetailListLike(flowCard.getProcessId(), String.valueOf(flowCard.getTechnologyNumber()),flowCard.getProcess());
                    //boolean containsCutting = flowCard.getProcess().contains("切割");
                    String processSub=flowCard.getProcess().substring(0, 2);
                    if(processSub.equals("夹胶") || processSub.equals("中空")){
                        itemmap.put("detail", flowCardMapper.getPrimaryListLimt(flowCard.getProcessId(), String.valueOf(flowCard.getTechnologyNumber()),flowCard.getGlassChild(),flowCard.getProcess()));

                        List<Map<String, Object>> detailList = flowCardMapper.getDetailList(flowCard.getProcessId(), flowCard.getTechnologyNumber(),flowCard.getProcess());
                        itemmap.put("detailList", detailList);
                    }
                    else {
                        List<Map<String, Object>> detailList = flowCardMapper.getDetailList(flowCard.getProcessId(), flowCard.getTechnologyNumber(),flowCard.getProcess());
                        itemmap.put("detail", flowCardMapper.getPrimaryList(flowCard.getProcessId(), String.valueOf(flowCard.getTechnologyNumber()),flowCard.getGlassChild(),flowCard.getProcess()));

                        List<Map<String, Object>> detailList = flowCardMapper.getDetailListLike(flowCard.getProcessId(), String.valueOf(flowCard.getTechnologyNumber()),flowCard.getProcess());
                        itemmap.put("detailList", detailList);
                    }


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

@@ -134,7 +134,7 @@
            map.put("Detail", reportingWorkMapper.SelectTechnologicalNumMp(processIdStr, technologyStr, process,reportType));
        } else {
            //不是第一道工序，查询报工数据
            List<Map<String,String>>  details = reportingWorkMapper.SelectReworlDetailMp(processIdStr, technologyStr, process);
            List<Map<String,String>>  details = reportingWorkMapper.SelectReworlDetailMp(processIdStr, technologyStr, process,previousProcess);
            if(process.equals("中空")){
                String orderId = processIdStr.substring(0,10);
                details.forEach( detail -> {

 north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml

@@ -598,6 +598,7 @@
        where process is not null
          and process != ""
        GROUP BY order_id,process_id,technology_number,process
        order by order_id,process_id,length(technology_number)
    </select>

    <select id="getPrimaryList">
@@ -662,7 +663,7 @@
            and fcs.process=#{process}
        where fc.process_id = #{processId}
          and position(fc.technology_number in #{technologyNumber})
        group by fc.process_id, fc.order_number,fc.technology_number
        group by fc.process_id, fc.order_number
        order by IF(fcs.sort != NULL or fcs.sort != '', fcs.sort, fc.order_number)
    </select>

@@ -1810,6 +1811,7 @@
        where process is not null
          and process != ""
        GROUP BY order_id,process_id,technology_number,process
        order by order_id,process_id,length(technology_number)
    </select>

    <insert id="printAddSortMp">
@@ -1833,4 +1835,42 @@
          and technology_number = #{technologyNumber}
          and process = #{process}
    </update>

    <select id="getPrimaryListLimt">
        select o.customer_name,
               o.project,
               #{process}                                         process,
               od.edging_type,
               #{glassChild}                                   as glass_child,
               od.product_name,
               o.processing_note,
               fc.process_id,
               SUM(od.quantity)                                as quantity,
               round(SUM(ogd.total_area), 2)                   as gross_area,
               sum(od.weight)                                  as weight,
               #{technologyNumber}                             as technologyNumber,
               concat(fc.process_id, '/', #{technologyNumber}) as processIdNumber,
               concat('对应我司单号',o.batch)                                         AS otherRemarks
        from flow_card as fc
                 left join sd.order_glass_detail as ogd
                           on fc.order_id = ogd.order_id and fc.order_number = ogd.order_number and
                              fc.technology_number = ogd.technology_number
                 left join sd.order_detail as od on od.order_id = fc.order_id and od.order_number = fc.order_number
                 left join sd.`order` as o on o.order_id = fc.order_id
                 left join sd.product as p on p.id = od.product_id
                 left join (select ogd.order_id,
                                   ogd.order_number,
                                   ogd.technology_number,
                                   ogd.glass_child,
                                   GROUP_CONCAT(glass_child SEPARATOR ' ') AS concatenated_glass_child
                            from sd.order_glass_detail as ogd
                            where ogd.order_id = left(#{processId}, 10)
                              and position(ogd.technology_number in #{technologyNumber})
                            GROUP BY order_id, order_number) as ogdc
                           on ogdc.order_id = ogd.order_id and ogdc.order_number = ogd.order_number and
                              ogdc.technology_number = ogd.technology_number
        where fc.process_id = #{processId}
          and position(fc.technology_number in #{technologyNumber})
        group by fc.process_id limit 1
    </select>
</mapper>

 north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml

@@ -106,11 +106,11 @@

    <!--    查询流程卡工艺流程-->
    <select id="SelectTechnologicalProcess">
        select ogd.process
        from sd.order_glass_detail as ogd
        where ogd.production_id = LEFT(#{processIdStr}, 11)
          and ogd.technology_number=#{technologyStr}
        limit 1
        select ifnull((select ogd.process
                       from sd.order_glass_detail as ogd
                       where ogd.production_id = LEFT(#{processIdStr}, 11)
                         and ogd.technology_number=#{technologyStr}
                       limit 1),'') as  process

    </select>

@@ -206,7 +206,7 @@
        LEFT JOIN sd.order_glass_detail AS ogd
                ON od.order_id = ogd.order_id
                AND od.order_number = ogd.order_number
        <if test="process == '夹胶'">
        <if test="process == '夹胶' or (process == '打胶和粘框' and previousProcess=='夹胶')">
            AND ogd.`group` = (select `group`
                               from sd.order_glass_detail
                               where order_id = ogd.order_id
@@ -248,7 +248,7 @@

        WHERE
            fc.process_id = #{processIdStr}
        <if test="process != '中空' and process != '夹胶' and process != '包装'">
        <if test="process != '中空' and process != '夹胶' and process != '包装' and process != '打胶和粘框' ">
           AND fc.technology_number = #{technologyStr}
        </if>
        AND odpd.process = #{process}