提交最新的程序

guoyuji

2024-06-26 d84a1f9ae5f04f92a7f13faef8e6e1aa81388a50

提交最新的程序

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

@@ -148,6 +148,7 @@


        <tr>
          <th>序号</th>
          <th class="title-1">{{company.columnName}}</th>
          <th>彩釉图号</th>
          <th>编号</th>
@@ -157,8 +158,7 @@
          <th>延米</th>
          <th>楼号</th>
          <th>加工要求</th>
          <th>交货日期</th>
          <th>序号</th>
          <th>备注</th>
          <th>备注1</th>
          <th>备注2</th>
          <th>备注3</th>
@@ -172,6 +172,7 @@
          <td colspan="3"></td>
        </tr>
        <tr v-for="(item1,index1) in item.productDetail" :key="index1">
          <td>{{item1.orderNumber}}</td>
          <td>{{  item1.otherColumns?.S02}}</td>
          <td>{{  item1.otherColumns?.S03}}</td>
          <td>{{  item1.otherColumns?.S01}}</td>
@@ -181,8 +182,7 @@
          <td>{{item1.perimeter}}</td>
          <td>{{item1.buildingNumber}}</td>
          <td>{{item1.processingNote}}</td>
          <td></td>
          <td>{{item1.orderNumber}}</td>
          <td>{{item1.remarks}}</td>

          <td>
            {{ ((item1.otherColumns?.S04)?item1.otherColumns.S04:'')}}

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

@@ -140,7 +140,7 @@
          <th>延米</th>
          <th>楼号</th>
          <th>加工要求</th>
          <th>交货日期</th>
          <th>备注</th>
          <th>序号</th>
          <th>备注1</th>
          <th>备注2</th>
@@ -166,7 +166,7 @@
          <td>{{item1.perimeter}}</td>
          <td>{{item1.buildingNumber}}</td>
          <td>{{item1.processingNote}}</td>
          <td>{{}}</td>
          <td>{{item1.remarks}}</td>
          <td></td>
          <td>{{((item1.otherColumns?.S04)?item1.otherColumns.S04:'')}}</td>
          <td>{{((item1.otherColumns?.S05)?item1.otherColumns.S05:'')}}</td>

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

@@ -1213,6 +1213,8 @@
              v-model="titleUploadData.deliveryDate"
              type="date"
              placeholder=""
              format="YYYY/MM/DD"
              value-format="YYYY-MM-DD"
              />
        </el-col>
        <el-col  :span="2"><el-text>{{$t('order.batch')}}：</el-text></el-col>

 north-glass-erp/src/main/java/com/example/erp/entity/sd/Order.java

@@ -26,7 +26,7 @@
    private String orderClassify;
    private String icon;
    private String packType;
    private String deliveryDate;
    private LocalDate deliveryDate;
    private String batch;
    private Integer calculateType;
    private Integer salesmanId;

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

@@ -165,7 +165,7 @@
        for (int i = 0; i < OrderDetails.size(); i++) {
            OrderDetails.get(i).setOrderNumber(i+1);
            OrderDetails.get(i).setOrderId(orderId);
            OrderDetails.get(i).setPerimeter(OrderDetails.get(i).getWidth()*OrderDetails.get(i).getHeight()*2/1000);
            OrderDetails.get(i).setPerimeter((OrderDetails.get(i).getWidth()+OrderDetails.get(i).getHeight())*2/1000);
            OrderDetails.get(i).setWeight(1.0);
            if(OrderDetails.get(i).getBendRadius()!=null && OrderDetails.get(i).getBendRadius()!=0){
                //获取弯钢弧度