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

guoyujie

6 小时以前 9b362b55344d0c854355eb2db1de84219b53a77e

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

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

@@ -222,8 +222,7 @@
      <template v-for="(item, index) in produceList" :key="index" >
        <tr>
          <td style="font-size: 15px;font-weight: bold;text-align: left" colspan="4">产品名称:
            <span v-if="company.productName!=='product_abbreviation'">{{item.productName}}</span>
            <span v-else >{{item.remarks}}</span>
            <span >{{item.productName}}</span>
          </td>
          <td v-if="company.showDeliveryCreator" style="font-size: 15px;font-weight: bold;text-align: left" colspan="2">订货日期:<span>{{delivery.contractId}}</span></td>
          <td v-else style="font-size: 15px;font-weight: bold;text-align: left" colspan="2"></td>

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

@@ -31,6 +31,8 @@
    private Integer reviewStatus;
    //架号
    private String rack;
    //补片状态
    private String patchState;
    //创建时间
    private LocalDate createTime;
    //修改时间

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

@@ -209,7 +209,7 @@
                            .eq("basic_name",uniqueList.get(i).get("process"))
                            .last("limit 1")
            );

            if(basicData!=null){
            //判断夹胶和夹胶后工序
            //Objects.equals(basicData.getNickname(), "stepA") || Objects.equals(basicData.getNickname(), "stepC")
            if(Objects.equals(basicData.getNickname(), "stepA") || Objects.equals(basicData.getNickname(), "stepC")){
@@ -222,6 +222,8 @@
            }
        }

        }


        List<Map<String, Object>> getRowCount = orderProcessDetailMapper.getGlassLRow(orderId);
        HashMap<Integer,Map<String, Object>> getRowCountMap = new HashMap<>();

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

@@ -570,12 +570,15 @@

                List<Map<String, Object>> deliveryDetailList2;
                if(state==3){
                    //洛阳有金额
                    deliveryDetailList2=deliveryDetailMapper.getSelectDeliveryPrintingMoneySpecifications(detail.getDeliveryId(),
                            detail.getOrderDetail().getProductId(), detail.getOrderDetail().getOrderId());
                }else if(state==4){
                    //洛阳无金额
                    deliveryDetailList2=deliveryDetailMapper.getSelectDeliveryPrintingNoMoneySpecifications(detail.getDeliveryId(),
                            detail.getOrderDetail().getProductId(), detail.getOrderDetail().getOrderId());
                }else{
                    //通用
                    deliveryDetailList2 = deliveryDetailMapper.getSelectDeliveryDetailPrinting(detail.getDeliveryId(),
                            detail.getOrderDetail().getProductId(), detail.getOrderDetail().getOrderId());
                }