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

廖井涛

5 天以前 b2ee05eb9357bf9d2441a10abc267bc234708f2a

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

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

@@ -79,7 +79,6 @@
                  props.lastList.push(list.value[i].data[j])
            }
          }
          console.log(props)
        } else {
          ElMessage.warning(res.msg)
          router.push("/login")

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

@@ -110,7 +110,6 @@
              }
            }
          }
          console.log(props)
        } else {
          ElMessage.warning(res.msg)
        }

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

@@ -168,7 +168,17 @@
      //每个序号面积
      collection.total_area = parseFloat((collection.width * collection.height * collection.quantity / 1000000).toFixed(2))
      totalArea = add(totalArea, collection.total_area)
      totalWeight += collection.width * collection.height * collection.quantity / 1000000 * collection.separation * 2.5 * 1;
      //根据有几层计算重量
      for (let j = 0; j < produceList.value[i].detail.length; j++) {
        if (produceList.value[i].detail[j].technologyNumber.length>1){
          totalWeight += collection.weight * collection.quantity  * 1;

        }else {
          totalWeight += collection.width * collection.height * collection.quantity / 1000000 * collection.separation * 2.5 * 1;

        }
      }

      //每个序号周长
      collection.perimeter = parseFloat(((collection.width * 2 + collection.height * 2) * collection.quantity / 1000).toFixed(3))
    });
@@ -359,7 +369,9 @@
      <td class="tdNowrap">单片名称：</td>
      <td colspan="3">{{ itemTr.glass_child }}</td>
      <td class="tdNowrap">产品名称：</td>
      <td :colspan="2+item.processList.length*2">{{ itemTr.product_name }}</td>

      <td v-if="!company.processFontSize" :colspan="2+item.processList.length*2">{{ itemTr.product_name }}</td>
      <td v-else :colspan="2+item.processList.length*2" style="font-size: 18px;">{{ itemTr.product_name }}</td>
    </tr>
    <tr>
      <td rowspan='2'>序号</td>

 north-glass-erp/northglass-erp/src/stores/sd/companySet/ÉϺ£±±²£.js

@@ -23,6 +23,8 @@
            msg:'basicData.msg.range99999Dec2'
        },
        orderIdType:'day',//后端生成订单号类型，day:每天生成，month:每月生成,year:每年生成
        orderIdTypeLetter:'NG',//订单号前面字母
        orderIdTypeMantissa:2,//订单号尾数保留位数  orderIdTypeLetter长度+orderIdTypeMantissa =4
        deliveryIdType:'day',
        deliveryDate:15,//订单创建送货日期 å¤©æ´¥7天，常州7天，义乌15天，新疆15天
        columnName:'图号',

 north-glass-erp/northglass-erp/src/stores/sd/companySet/Ìì½ò±±²£.js

@@ -23,6 +23,8 @@
            msg:'basicData.msg.range99999Dec2'
        },
        orderIdType:'year',//后端生成订单号类型，day:每天生成，month:每月生成,year:每年生成
        orderIdTypeLetter:'NG',//订单号前面字母
        orderIdTypeMantissa:2,//订单号尾数保留位数  orderIdTypeLetter长度+orderIdTypeMantissa =4
        deliveryIdType:'day',//后端生成发货单号类型，day:每天生成，month:每月生成
        deliveryDate:7,//订单创建送货日期 å¤©æ´¥7天，常州7天，义乌15天，新疆15天
        columnName:'图号',//打印生产单时需要显示的列名，没有为空

 north-glass-erp/northglass-erp/src/stores/sd/companySet/³£ÖݼªÀû.js

@@ -23,6 +23,8 @@
            msg:'basicData.msg.range9999Dec'
        },
        orderIdType:'month',//后端生成订单号类型，day:每天生成，month:每月生成
        orderIdTypeLetter:'NG',//订单号前面字母
        orderIdTypeMantissa:2,//订单号尾数保留位数  orderIdTypeLetter长度+orderIdTypeMantissa =4
        deliveryIdType:'month',//后端生成发货单号类型，day:每天生成，month:每月生成
        deliveryDate:7,//订单创建送货日期 å¤©æ´¥7天，常州7天，义乌15天，新疆15天
        columnName:'异形参数',//打印生产单时需要显示的列名，没有为空

 north-glass-erp/northglass-erp/src/stores/sd/companySet/н®ºãöÎ.js

@@ -23,6 +23,8 @@
            msg:'basicData.msg.range99999Dec2'
        },
        orderIdType:'year',//后端生成订单号类型，day:每天生成，month:每月生成,year:按年生成
        orderIdTypeLetter:'NG',//订单号前面字母
        orderIdTypeMantissa:2,//订单号尾数保留位数  orderIdTypeLetter长度+orderIdTypeMantissa =4
        deliveryIdType:'day',//后端生成发货单号类型，day:每天生成，month:每月生成
        deliveryDate:15,//订单创建送货日期 å¤©æ´¥7天，常州7天，义乌15天，新疆15天
        columnName:'图号',//打印生产单时需要显示的列名，没有为空

 north-glass-erp/northglass-erp/src/stores/sd/companySet/ÂåÑô±±²£.js

@@ -23,6 +23,8 @@
            msg:'basicData.msg.range99999Dec2'
        },
        orderIdType:'day',//后端生成订单号类型，day:每天生成，month:每月生成,year:每年生成
        orderIdTypeLetter:'NG',//订单号前面字母
        orderIdTypeMantissa:2,//订单号尾数保留位数  orderIdTypeLetter长度+orderIdTypeMantissa =4
        deliveryIdType:'day',
        deliveryDate:15,//订单创建送货日期 å¤©æ´¥7天，常州7天，义乌15天，新疆15天
        columnName:'图号',

 north-glass-erp/northglass-erp/src/stores/sd/companySet/ÎÂÖݾÞÐÇ.js

@@ -23,6 +23,8 @@
            msg:'basicData.msg.range99999Dec2'
        },
        orderIdType:'day',//后端生成订单号类型，day:每天生成，month:每月生成,year:每年生成
        orderIdTypeLetter:'NG',//订单号前面字母
        orderIdTypeMantissa:2,//订单号尾数保留位数  orderIdTypeLetter长度+orderIdTypeMantissa =4
        deliveryIdType:'day',//后端生成发货单号类型，day:每天生成，month:每月生成
        deliveryDate:15,//订单创建送货日期 å¤©æ´¥7天，常州7天，义乌15天，新疆15天
        columnName:'图号',//打印生产单时需要显示的列名，没有为空

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

@@ -22,7 +22,9 @@
            //regexp:/^(0|[1-9][0-9]{0,3}([.][0-9]{1,2})?)$/,//正则0.00-9999.99
            msg:'basicData.msg.range99999Dec2'
        },
        orderIdType:'year',//后端生成订单号类型，day:每天生成，month:每月生成,year:每年生成
        orderIdType:'day',//后端生成订单号类型，day:每天生成，month:每月生成,year:每年生成
        orderIdTypeLetter:'R',//订单号前面字母
        orderIdTypeMantissa:3,//订单号尾数保留位数  orderIdTypeLetter长度+orderIdTypeMantissa =4
        deliveryIdType:'day',//后端生成发货单号类型，day:每天生成，month:每月生成
        deliveryDate:15,//订单创建送货日期 å¤©æ´¥7天，常州7天，义乌15天，新疆15天
        columnName:'图号',//打印生产单时需要显示的列名，没有为空

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

@@ -899,7 +899,10 @@
    }
  }
}

const brokenGridKey = ref(0)
const openedBrokenTable = async () => {
  brokenGridKey.value++
  await nextTick()
  console.log('breakageType:', titleSelectJson.value.breakageType)
  console.log('breakageReason:', titleSelectJson.value.breakageReason)
@@ -1893,7 +1896,7 @@
          +brokenRow.glass_child+'.'+brokenRow.order_number+'.'+brokenRow.technology_number"
          style="width: 80%;height:75% ">
        <vxe-grid

            :key="brokenGridKey"
            height="400px"
            ref="brokenGrid"
            class="mytable-scrollbar"

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

@@ -401,7 +401,9 @@
              creator:userStore.user.userName,
              creatorId:userStore.user.userId,
              newOrderId:newOrderId.value,
              position:company.position
              position:company.position,
              orderIdTypeLetter:company.orderIdTypeLetter,
              orderIdTypeMantissa:company.orderIdTypeMantissa
            }
            const grossAreaList = $grid.getTableData().fullData.filter(
                item=>item.grossArea === 0

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

@@ -67,12 +67,14 @@

    @ApiOperation("可入库的成品查询接口")
    @PostMapping("/getSelectWarehousingList")
    @SaCheckPermission("createProductStock.search")
    public Result getSelectWarehousingList(@RequestBody Map<String,String> map){
        return Result.success(finishedGoodsInventoryService.getSelectWarehousingApp(map.get("processId")));
    }

    @ApiOperation("成品入库接口")
    @PostMapping("/addSelectWarehousing")
    @SaCheckPermission("createProductStock.add")
    public Result addSelectWarehousing( @RequestBody Map<String,Object> object){
        return Result.success(finishedGoodsInventoryService.addSelectWarehousing(object));

@@ -80,12 +82,14 @@

    @ApiOperation("可发货的成品查询接口")
    @PostMapping("/getSelectDeliveryDetailList")
    @SaCheckPermission("finishedProductOut.search")
    public Result getSelectDeliveryDetailList(){
        return Result.success(finishedGoodsInventoryService.getSelectDeliveryDetailApp());
    }

    @ApiOperation("成品出库接口")
    @PostMapping("/addDeliveryDetail")
    @SaCheckPermission("finishedProductOut.add")
    public Result addDeliveryDetail( @RequestBody Map<String,Object>  object){
        return Result.success(finishedGoodsInventoryService.addDeliveryDetail(object));
    }

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

@@ -29,7 +29,6 @@

import java.math.BigDecimal;
import java.math.RoundingMode;
import java.sql.SQLOutput;
import java.text.DecimalFormat;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
@@ -67,6 +66,8 @@
    public boolean saveOrder(Map<String,Object> orderMap) throws Exception {
        JSONObject orderJson = new JSONObject(orderMap);
        String orderIdType = orderJson.getString("orderIdType");
        String orderIdTypeLetter = orderJson.getString("orderIdTypeLetter");
        Integer orderIdTypeMantissa = orderJson.getInteger("orderIdTypeMantissa");
        Order order = JSONObject.parseObject(JSONObject.toJSONString(orderJson.get("title")), Order.class);
        List<OrderDetail> OrderDetails = JSONArray.parseArray(JSONObject.toJSONString(orderJson.get("detail")), OrderDetail.class);
        List<OrderOtherMoney> orderOtherMoneyList = JSONArray.parseArray(JSONObject.toJSONString(orderJson.get("otherMoney")), OrderOtherMoney.class);
@@ -85,7 +86,12 @@
            log.setContent(orderMap.toString());

            if(order.getOrderId() == null || order.getOrderId().isEmpty()){
                insertOrder(order,OrderDetails,orderOtherMoneyList,orderIdType, (Map<String, String>) orderMap.get("position"));
                insertOrder(order,
                        OrderDetails,orderOtherMoneyList,orderIdType,
                        (Map<String, String>) orderMap.get("position"),
                        orderIdTypeLetter,
                        orderIdTypeMantissa
                );
                log.setFunction("saveOrder创建:"+order.getOrderId());
            }else {
                updateOrder(order,OrderDetails,orderOtherMoneyList,(Map<String, String>) orderMap.get("position"));
@@ -165,9 +171,9 @@
        return map;
    }
    //生成订单数据
    public void insertOrder(Order order, List<OrderDetail> OrderDetails, List<OrderOtherMoney> orderOtherMoneyList, String orderIdType, Map<String,String> position) {
    public void insertOrder(Order order, List<OrderDetail> OrderDetails, List<OrderOtherMoney> orderOtherMoneyList, String orderIdType, Map<String,String> position, String orderIdTypeLetter, Integer orderIdTypeMantissa) {
        //根据传入的当前月份或者当天生成订单id
        String orderId =  getOrderId(orderIdType);
        String orderId =  getOrderId(orderIdType,orderIdTypeLetter,orderIdTypeMantissa);
        //往主表插数据
        order.setOrderId(orderId);
        order.setCreateOrder(2);
@@ -175,32 +181,34 @@
        insertOtherDetail(orderId,OrderDetails,orderOtherMoneyList,position);
    }

    private String getOrderId(String dateType){
    private String getOrderId(String dateType, String orderIdTypeLetter, Integer orderIdTypeMantissa){
        String orderId = null;
        Integer orderIdTypeLetterLen = orderIdTypeLetter.length();
        Integer count = orderIdTypeLetterLen+orderIdTypeMantissa;
        if(dateType==null || dateType.equals("day")){
            Integer maxOrderId = orderMapper.selectMaxOrderId();
            //查询订单id，并且自增
            String formattedNumber = String.format("%02d", maxOrderId+1);
            String formattedNumber = String.format("%0"+orderIdTypeMantissa+"d", maxOrderId+1);
            //格式化当前日期
            Date currentDate = new Date();
            SimpleDateFormat dateFormat = new SimpleDateFormat("yyMMdd");
            String formattedDate = dateFormat.format(currentDate);
            orderId =  "NG"+formattedDate+formattedNumber;
            orderId =  orderIdTypeLetter+formattedDate+formattedNumber;
        }else if(dateType.equals("month")){
            Integer maxOrderId = orderMapper.selectMaxOrderIdByMonth();
            String formattedNumber = String.format("%04d", maxOrderId+1);
            String formattedNumber = String.format("%0"+(orderIdTypeMantissa+2)+"d", maxOrderId+1);
            Date currentDate = new Date();
            SimpleDateFormat dateFormat = new SimpleDateFormat("yyMM");
            String formattedDate = dateFormat.format(currentDate);
            orderId =  "NG"+formattedDate+formattedNumber;
            orderId =  orderIdTypeLetter+formattedDate+formattedNumber;

        }else if(dateType.equals("year")){
            Integer maxOrderId = orderMapper.selectMaxOrderIdByYear();
            String formattedNumber = String.format("%06d", maxOrderId+1);
            String formattedNumber = String.format("%"+(orderIdTypeMantissa+4)+"d", maxOrderId+1);
            Date currentDate = new Date();
            SimpleDateFormat dateFormat = new SimpleDateFormat("yy");
            String formattedDate = dateFormat.format(currentDate);
            orderId =  "NG"+formattedDate+formattedNumber;
            orderId =  orderIdTypeLetter+formattedDate+formattedNumber;
        }
        return orderId;
    }

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

@@ -808,7 +808,8 @@
               pd.separation,
               fc.technology_number,
               IFNULL(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S02')),'') as mapNumber,
               od.building_number
               od.building_number,
               od.weight
        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
@@ -3559,7 +3560,8 @@
        pd.separation,
        #{compound} as technology_number,
        IFNULL(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S02')),'') as mapNumber,
        od.building_number
        od.building_number,
        od.weight
        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