Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

huang

2025-01-14 93109c8a43cceb99ce39e1ccfdbd560ac2547422

Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

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

@@ -194,6 +194,18 @@
    }
  },
  {
    tid: 'icon', title: '商标', data: '', type: 'text',
    options: {
      field: 'icon',
      testData: '',
      width:270,
      height: 16,
      fontSize: 11.25,
      textAlign: "left",
      textContentVerticalAlign: "middle"
    }
  },
  {
    tid: 'orderType', title: '订单类型', data: '', type: 'text',
    options: {
      field: 'orderType',
@@ -852,7 +864,7 @@
}
const changeTag = () => {
  const json = JSON.parse(tag.value.value)
  //json.panels[0].printElements[0].options.fields.push({text: '序号尺寸', field: 'numberSize'})
  //json.panels[0].printElements[0].options.fields.push({text: '商标', field: 'icon'})

  hiprintTemplate.value.setPaper(json.panels[0].width, json.panels[0].height)
  hiprintTemplate.value.update(json)

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

@@ -192,12 +192,15 @@
      <div class="row5">
        <span style="white-space: pre-wrap;font-size: 6pt">{{ item.building_number?item.building_number.replace(/\r|\n|\s/g,''):'' }}</span>
        <span v-if="item.bend_radius!=null">R={{item.bend_radius}}</span>
      </div>
      <div class="row6">
        <span>{{item.glass_child}}</span>&nbsp;
        <br>
        <span v-if="company.showDeliveryCreator" >{{item.processing_note}}</span>
        <span v-else style="font-size: 6pt">{{item.processing_note}}</span>
      </div>
      <div class="row6">
        <span>{{item.glass_child}}</span>&nbsp;

      </div>

      <div class="row5">
        <span>{{item.project}}</span>&nbsp;
      </div>
@@ -275,7 +278,7 @@
#entirety{
  text-align: center;
  width: 180px;
  height: 87px;
  height: 90px;
  margin-bottom: 10px;
  margin-right: 5px;
  overflow: hidden;
@@ -322,7 +325,7 @@

.row5 {
  margin-top: 5px;
  height: 15px;
  height: 18px;
  font-weight: bold;
  font-size: 6pt;
}

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

@@ -134,7 +134,7 @@
  keyboardConfig:{
    isArrow: true,
    isDel: true,
    isEnter: true,
    //isEnter: true,
    isTab: true,
    isEdit: true,
    isChecked: true
@@ -1386,13 +1386,51 @@
  }
  if(evnt.$event.keyCode === 13 ){
    const { rowIndex,row,column } = xGrid.value.getSelectedCell() || xGrid.value.getEditRecord()
    let nextRowIndex = xGrid.value.getRowIndex(row) + 1;
    if (nextRowIndex < xGrid.value.getTableData().fullData.length) {
    let nextRowIndex = xGrid.value.getRowIndex(row) + 1


    switch (column.field){
      case 'width':
        xGrid.value.setSelectCell(row, 'height')
        break;
      case 'height':
        xGrid.value.setSelectCell(row, 'quantity')
        break;
      case 'quantity':
        if(nextRowIndex === length){
          xGrid.value.insertAt({}, xGrid.value.getTableData.length || -1)
        }
        const nextRow = xGrid.value.getTableData().fullData[nextRowIndex]
        xGrid.value.setCurrentRow(nextRow)
        xGrid.value.scrollToRow(nextRow)
        xGrid.value.setSelectCell(nextRow, 'width')
        break;
      default:
        /*if (nextRowIndex < length) {
          const nextRow = xGrid.value.getTableData().fullData[nextRowIndex]
          xGrid.value.setCurrentRow(nextRow)
          xGrid.value.scrollToRow(nextRow)
          xGrid.value.setSelectCell(nextRow, column.field)
        }*/
        if(nextRowIndex === length){
          xGrid.value.insertAt({}, xGrid.value.getTableData.length || -1)
        }
        const nextRow1 = xGrid.value.getTableData().fullData[nextRowIndex]
        xGrid.value.setCurrentRow(nextRow1)
        xGrid.value.scrollToRow(nextRow1)
        xGrid.value.setSelectCell(nextRow1, column.field)
        break;

    }



    /*if (nextRowIndex < xGrid.value.getTableData().fullData.length) {
      xGrid.value.setCurrentRow(xGrid.value.getTableData().fullData[nextRowIndex]);
    }
    if(rowIndex === length-1){
      xGrid.value.insertAt({}, xGrid.value.getTableData.length || -1)
    }
    }*/

  }
  if(evnt.$event.keyCode === 38 ){

 north-glass-erp/src/main/java/com/example/erp/controller/userInfo/UserInfoController.java

@@ -10,6 +10,8 @@
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;

import java.util.Map;

@RestController
@Api(value="用户controller",tags={"用户操作接口"})
@RequestMapping("/userInfo")
@@ -62,6 +64,12 @@
        return Result.seccess(userService.findAll());
    }

    @ApiOperation("app查询报工班组列表")
    @PostMapping("findByAddress")
    public Result findByAddress(@RequestBody Map<String,String> userName){
        return Result.seccess(userService.findByAddress(userName));
    }

    @ApiOperation("查询所有工序")
    @SaCheckPermission("userList.search")
    @PostMapping("selectProcess")

 north-glass-erp/src/main/java/com/example/erp/entity/pp/ReportingWork.java

@@ -3,14 +3,12 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.example.erp.entity.sd.DeliveryDetail;
import com.example.erp.entity.sd.Order;
import com.example.erp.entity.sd.OrderDetail;
import com.example.erp.entity.sd.OrderGlassDetail;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;

import java.time.LocalDate;
import java.time.LocalDateTime;

@Data

 north-glass-erp/src/main/java/com/example/erp/mapper/userInfo/UserMapper.java

@@ -2,7 +2,6 @@


import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.example.erp.controller.dto.UserDTO;
import com.example.erp.entity.userInfo.User;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -38,4 +37,6 @@
    Boolean updateUserNameById(Integer id,String userName);

    Boolean updateProcessMp(Integer id, String process);

    List<User> findByAddress(String userName);
}

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

@@ -245,6 +245,10 @@
        } else {
            reportingWork.setReviewedState(0);
        }
        if(reportingWork.getReportingWorkTime()==null){
            LocalDateTime localDateTime = LocalDateTime.now();
            reportingWork.setReportingWorkTime(localDateTime);
        }

        reportingWork.setNextProcess(orderProcessDetailMapper.selectNextProcess(processIdStr[0],processIdStr[1],reportingWork.getThisProcess()));
        //主表插入

 north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java

@@ -165,7 +165,7 @@

    private String getOrderId(String dateType){
        String orderId = null;
        if(dateType.equals("day")){
        if(dateType==null || dateType.equals("day")){
            Integer maxOrderId = orderMapper.selectMaxOrderId();
            //查询订单id，并且自增
            String formattedNumber = String.format("%02d", maxOrderId+1);

 north-glass-erp/src/main/java/com/example/erp/service/userInfo/UserService.java

@@ -5,24 +5,17 @@
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.example.erp.controller.dto.UserDTO;
import com.example.erp.entity.userInfo.PermissionBasic;
import com.example.erp.entity.userInfo.Role;
import com.example.erp.entity.userInfo.SysError;
import com.example.erp.entity.userInfo.User;
import com.example.erp.mapper.pp.ProductionSchedulingMapper;
import com.example.erp.mapper.userInfo.*;
import com.example.erp.tools.TokenTools;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cache.annotation.CacheEvict;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;

import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;

@Service
@DS("user_info")
@@ -196,5 +189,23 @@
    public Boolean updateProcessSv(Integer id, String process) {
        return userMapper.updateProcessMp(id,process);
    }

    public Object findByAddress(Map<String,String> userName) {
        if(Objects.equals(userName.get("userName"), "")){
            userName.put("userName", null) ;
        }
        List<User> users = userMapper.findByAddress(userName.get("userName"));
        List<Map<String,Object>> userList = new ArrayList<>();
        users.forEach(user -> {
            Map<String,Object> userMap = new HashMap<>();
            userMap.put("value", user.getLoginName());
            userMap.put("text", user.getUserName());
            userList.add(userMap);
        });
        Map<String,List<Object>> map = new HashMap<>();

        map.put("users", Collections.singletonList(userList));
        return map;
    }
}


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

@@ -95,7 +95,7 @@
        select
             max(a.technology_number) as rowCount,
             RowNum
        from order_process_detail as a
        from sd.order_process_detail as a
        left join
            (select min((@i:=@i+1)) AS RowNum,c.*
             from sd.order_glass_detail as c,

 north-glass-erp/src/main/resources/mapper/userInfo/User.xml

@@ -29,6 +29,20 @@
        on b.role_id = c.id
        where state =1 and a.id != 1
    </select>
    <select id="findByAddress" resultMap="findAllMap">
        SELECT a.*,
               b.role_id,
               c.role
        FROM erp_user_info.user as a
                 left join user_role as b
                           on a.id = b.user_id
                 left join role as c
                           on b.role_id = c.id
        where state =1 and a.id != 1 and address is not null and address !=''
        <if test="userName != null and userName != '' and userName != 'null'">
            and user_name like concat('%',#{userName},'%')
        </if>
    </select>

    <select id="findOne" >
        SELECT *