parent: 621c1c37 | 补丁 | 提交 | ignore whitespace
chenlu
2025-12-03 a00e1b3a8ff8cdadb7f8d897742097b30a5924fc 
Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
4个文件已修改
87 ■■■■■ 已修改文件
north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet3.vue 39 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet4.vue 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/OptimizationRect.vue 34 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/service/pp/GlassOptimizeService.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet3.vue


@@ -215,29 +215,33 @@


            <template v-for="(item, index) in itme1.data" :key="index" >


              <thead>


              <tr v-if="index===0">


                <th style="width: 9%;">楼层编号</th>


                <th style="width: 14%;" colspan="1">宽X高</th>


                <th style="width: 8%;">数量</th>


                <th style="width: 9%;">面积</th>


                <th style="width: 9%;">单价</th>


                <th style="width: 9.5%;">金额</th>


                <th style="width: 6%;">面积</th>


                <th style="width: 6%;">单价</th>


                <th style="width: 6.5%;">金额</th>


                <th style="width: 1%;"></th>


                <th style="width: 9%;">楼层编号</th>


                <th style="width: 14%;" colspan="1">宽X高</th>


                <th style="width: 8%;">数量</th>


                <th style="width: 9%;">面积</th>


                <th style="width: 9%;">单价</th>


                <th style="width: 9.5%;">金额</th>


                <th style="width: 6%;">面积</th>


                <th style="width: 6%;">单价</th>


                <th style="width: 6.5%;">金额</th>


                <th style="width: 1%;"></th>


              </tr>






              </thead>


              <tr>


                <td style="font-size: 15px;text-align: left" colspan="5">产品名称:<span>{{item.DeliveryDetail.orderDetail.productName}}</span></td>


                <td style="font-size: 15px;text-align: left" colspan="6">产品名称:<span>{{item.DeliveryDetail.orderDetail.productName}}</span></td>


                <td style="font-size: 15px;text-align: left" colspan="3">批次:<span>{{item.DeliveryDetail.order.batch}}</span></td>


                <td style="font-size: 15px;text-align: left" colspan="3">订单编号:<span>{{item.DeliveryDetail.orderDetail.orderId}}</span></td>


                <td style="font-size: 15px;text-align: left" colspan="4">订单编号:<span>{{item.DeliveryDetail.orderDetail.orderId}}</span></td>


              </tr>




              <tr class="day-in" v-for="(group, groupIndex) in item.groupedDeliveryDetails" :key="groupIndex">


                <!-- 第一列数据（组内第一条） -->


                <td>{{ group[0].buildingNumber }}</td>


                <td style="font-size: 15px;font-weight: bold;">


                  {{ group[0].parsedOtherColumns?.S02 ? `(${group[0].parsedOtherColumns.S02})` : '' }}


                  {{ group[0].width }}x{{ group[0].height }}


@@ -249,6 +253,7 @@


                <td></td> <!-- 分隔列 -->




                <!-- 第二列数据（组内第二条，若存在） -->


                <td v-if="group[1]">{{ group[1].buildingNumber }}</td>


                <td style="font-size: 15px;font-weight: bold;" v-if="group[1]">


                  {{ group[1].parsedOtherColumns?.S02 ? `(${group[1].parsedOtherColumns.S02})` : '' }}


                  {{ group[1].width }}x{{ group[1].height }}


@@ -262,7 +267,7 @@


                <td v-else colspan="5"></td>


              </tr>


              <tr class="day-in" >


                <td style="font-size: 15px;" colspan="7">小计:</td>


                <td style="font-size: 15px;" colspan="9">小计:</td>


                <td>{{item.DeliveryDetail.quantity}}</td>


                <td>{{item.DeliveryDetail.area}}</td>


                <td></td>


@@ -271,14 +276,14 @@




            </template>


            <tr class="day-in">


              <td style="font-size: 15px;" colspan="7">合计:</td>


              <td style="font-size: 15px;" colspan="9">合计:</td>


              <td>{{itme1.delivery.quantity}}</td>


              <td>{{itme1.delivery.area}}</td>


              <td></td>


              <td>{{parseFloat(itme1.sumMoney.toFixed(2))}}</td>


            </tr>


            <tr class="day-in">


              <td style="text-align: left;border-width: 0 1px 0 0; border-style: solid; border-color: #d3dce6" colspan="6">


              <td style="text-align: left;border-width: 0 1px 0 0; border-style: solid; border-color: #d3dce6" colspan="7">


                <div style="display: flex;font-size: 10px;text-align: center;">


                  <span style="width: 25%;font-weight: bold;font-size: 12px">加工费用</span>&nbsp;


                  <span  style="width: 25%;font-weight: bold;font-size: 12px">单价</span>&nbsp;


@@ -286,10 +291,10 @@


                  <span  style="width: 25%;font-weight: bold;font-size: 12px">金额</span>


                </div>


              </td>


              <td style="text-align: left;border:none;font-size: 15px;" colspan="5">总金额:&nbsp;&nbsp;&nbsp;&nbsp;{{itme1.delivery.money}}</td>


              <td style="text-align: left;border:none;font-size: 15px;" colspan="6">总金额:&nbsp;&nbsp;&nbsp;&nbsp;{{itme1.delivery.money}}</td>


            </tr>


            <tr class="day-in">


              <td style="text-align: left;border-width: 0 1px 0 0; border-style: solid; border-color: #d3dce6;" colspan="6" >


              <td style="text-align: left;border-width: 0 1px 0 0; border-style: solid; border-color: #d3dce6;" colspan="7" >


                <div style="display: flex;font-size: 10px;text-align: center" v-for="(item, index2) in itme1.otherMoney1" :key="index2">


                  <span style="width: 25%">{{item.DeliveryDetailOtherMoney.alias}}</span>&nbsp;


                  <span  style="width: 25%">{{item.DeliveryDetailOtherMoney.price}}</span>&nbsp;


@@ -303,7 +308,7 @@


                  <span  style="width: 25%">{{itme1.delivery.freight}}</span>


                </div>


              </td>


              <td style="text-align: left;border:none;font-size: 15px;" colspan="5">大写金额:&nbsp;&nbsp;&nbsp;&nbsp;{{itme1.money}}</td>


              <td style="text-align: left;border:none;font-size: 15px;" colspan="6">大写金额:&nbsp;&nbsp;&nbsp;&nbsp;{{itme1.money}}</td>


            </tr>






@@ -317,7 +322,7 @@


                  </el-row>-->




            <tr class="day-in" style="border: 0;" v-if="company.showDeliveryCreator">


              <td colspan="11" style="border: 0">


              <td colspan="13" style="border: 0">


                <div style="display:flex;text-align: left"  class="bottom">


                  <div style="width: 15%">制单员：{{ itme1.delivery.creator }}</div>


                  <div style="width: 25%">制单日期：{{ itme1.delivery.createTime }}</div>


@@ -329,7 +334,7 @@


              </td>


            </tr>


            <tr class="day-in" style="border: 0;" v-if="company.showDeliveryCreator">


              <td colspan="11" style="border: 0;">


              <td colspan="13" style="border: 0;">


                <div style="display:flex;" class="bottom">


                  架子&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;只&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;


                  {{takeCare}}


@@ -337,7 +342,7 @@


              </td>


            </tr>


            <tr class="day-in" style="border: 0;">


              <td colspan="11" style="border: 0;">


              <td colspan="13" style="border: 0;">


                <div style="display:flex;text-align: left;border: 0;margin-top: 10px " class="bottom" >


                  <el-input type="textarea" :autosize="{ minRows: 7, maxRows: 20 }" v-model="remark"/>


                </div>




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


@@ -215,11 +215,13 @@


            <template v-for="(item, index) in itme1.data" :key="index" >


              <thead>


              <tr v-if="index===0">


                <th style="width: 14%;" colspan="3">宽X高</th>


                <th style="width: 9%;">楼层编号</th>


                <th style="width: 14%;" colspan="2">宽X高</th>


                <th style="width: 8%;">数量</th>


                <th style="width: 9%;">面积</th>


                <th style="width: 1%;"></th>


                <th style="width: 14%;" colspan="3">宽X高</th>


                <th style="width: 9%;">楼层编号</th>


                <th style="width: 14%;" colspan="2">宽X高</th>


                <th style="width: 8%;">数量</th>


                <th style="width: 9%;">面积</th>


              </tr>


@@ -234,7 +236,8 @@




              <tr class="day-in" v-for="(group, groupIndex) in item.groupedDeliveryDetails" :key="groupIndex">


                <!-- 第一列数据（组内第一条） -->


                <td style="font-size: 15px;font-weight: bold;" colspan="3">


                <td>{{ group[0].buildingNumber }}</td>


                <td style="font-size: 15px;font-weight: bold;" colspan="2">


                  {{ group[0].parsedOtherColumns?.S02 ? `(${group[0].parsedOtherColumns.S02})` : '' }}


                  {{ group[0].width }}x{{ group[0].height }}


                </td>


@@ -243,7 +246,8 @@


                <td></td> <!-- 分隔列 -->




                <!-- 第二列数据（组内第二条，若存在） -->


                <td style="font-size: 15px;font-weight: bold;" colspan="3" v-if="group[1]">


                <td v-if="group[1]">{{ group[1].buildingNumber }}</td>


                <td style="font-size: 15px;font-weight: bold;" colspan="2" v-if="group[1]">


                  {{ group[1].parsedOtherColumns?.S02 ? `(${group[1].parsedOtherColumns.S02})` : '' }}


                  {{ group[1].width }}x{{ group[1].height }}


                </td>




 north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/OptimizationRect.vue


@@ -253,6 +253,12 @@


  return bestFit;



};







const isSelected = (layoutIndex, rectIndex) => {



  return focusIndex.value &&



         focusIndex.value.layoutIndex === layoutIndex &&



         focusIndex.value.rectIndex === rectIndex;



};







//版图内容样式加载



const layoutContainerStyle = (layoutIndex) => {



  const layout = layouts.value[layoutIndex];



@@ -304,9 +310,10 @@


//版图内容小片样式加载



const rectStyle = (glassDetail, layoutIndex) => {



  const layout = layouts.value[layoutIndex];



  const scale = Math.min(0.25



  );



  return {



  const scale = Math.min(0.25);



  const isSelectedRect = isSelected(layoutIndex, layout.glassDetails.indexOf(glassDetail));







  let style = {



    position: 'absolute',



    left: `${glassDetail.x * scale}px`,



    top: `${glassDetail.y * scale}px`,



@@ -318,13 +325,21 @@


    draggable: !glassDetail.isRemain,



    zIndex: glassDetail.isRemain ? 1 : 2



  };







  // 如果被选中，则添加内侧红框



  if (isSelectedRect) {



    style.boxShadow = 'inset 0 0 0 2px red';



  }







  return style;



};







const rectStyle1 = (glassDetail, layoutIndex) => {



  const layout = layouts.value[layoutIndex];



  const scale = Math.min(0.25



  );



  return {



  const scale = Math.min(0.25);



  const isSelectedRect = isSelected(layoutIndex, layout.glassDetails.indexOf(glassDetail));







  let style = {



    position: 'absolute',



    left: `${glassDetail.x * scale}px`,



    top: `${glassDetail.y * scale}px`,



@@ -336,6 +351,13 @@


    draggable: !glassDetail.isRemain,



    zIndex: glassDetail.isRemain ? 1 : 2



  };







  // 如果被选中，则添加内侧红框



  if (isSelectedRect) {



    style.boxShadow = 'inset 0 0 0 2px red';



  }







  return style;



};







//点击小片





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


@@ -47,7 +47,7 @@


    @Autowired


    SysErrorService sysErrorService;




    @Value("${mesIp:10.153.19.31}")


    @Value("${mesIp:localhost}")


    private String mesIp;




    RabbitMQUtil rabbitMQUtil;