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

chenlu

2024-09-10 ed3ce5c8f6e1f7ac1aad3218ab5e518fc95cdb0f

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

 north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet4.vue

@@ -322,6 +322,12 @@
  height: 30px;
}

@media print {
  @page {
    margin: 5mm 5mm 10mm 5mm;
  }
}





 north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet5.vue

@@ -338,6 +338,11 @@
  margin: 0;
  padding: 0;
}
@media print {
  @page {
    margin: 5mm 5mm 10mm 5mm;
  }
}




 north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel.vue

@@ -133,7 +133,7 @@
    <div id="entirety" v-for="(item,id) in labelList" >
        <div class="row1">

          <div style="position: absolute;font-weight: bold;margin-left: 5px;" v-if="item.heat_layout_id!=null">{{ item.heat_layout_id }}/{{ item.heat_layout_sort }}</div>
          <div class="cell" v-if="item.heat_layout_id!=null">{{ item.heat_layout_id }}/{{ item.heat_layout_sort }}</div>
          <span>{{ item.customer_name }}</span>&nbsp;
          <span>{{ item.order_id }}</span>&nbsp;
          <span v-if="item.process.includes('夹胶')">胶片</span>
@@ -240,6 +240,12 @@
  font-size: 10pt;
  font-weight: bold;
}
.cell{
  position: absolute;
  font-weight: bold;
  margin-left: 5px;
  margin-top: 0px;
}




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

@@ -364,7 +364,7 @@
                item=>item.grossArea === 0
            )
            const errorAreaList = $grid.getTableData().fullData.filter(
                item=>(item.width*item.height/1000000 < errorArea.value*1 && item.computeArea < errorArea.value*1)
                item=>(item.width*item.height/1000000 < errorArea.value*1)
            )
            if(grossAreaList.length>0){
              alert(t('order.msg.grossAreaIsNot0'))

 north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportingWorkController.java

@@ -150,8 +150,11 @@
        }else{
            throw new ServiceException(Constants.Code_600, "上工序已完工数量小于本工序报工数量，请检查");
        }


    }
    @ApiOperation("mes报工次破新增")
    @PostMapping  ("/mesSaveReportingWorkWorn")
    public Result mesSaveReportingWorkWorn(@RequestBody Map<String,Object> reportingWork)  {
        return  Result.seccess(reportingWorkService.SaveReportingWorkSv(reportingWork));
    }

}

 north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml

@@ -554,7 +554,7 @@


    <select id="getmaximum" >
        select count(*) from mm.finished_operate_log where operate_type =#{type} and date(operate_time)=CURDATE()
        select count(*) from (select * from mm.finished_operate_log where operate_type =#{type} and date(operate_time)=CURDATE() group by operation_order_number) zu
    </select>

    <insert id="insertIntFinishedOperateLog"  useGeneratedKeys="true" >