Merge branch 'master' of http://bore.pub:10439/r/ERP_override

guoyujie

2025-07-08 368b5a8bed1af57fb51f5c836e2e15059765019b

Merge branch 'master' of http://bore.pub:10439/r/ERP_override

# Conflicts:
#	north-glass-erp/northglass-erp/src/components/mm/PrintPackingListLuoyang.vue

 north-glass-erp/northglass-erp/src/components/mm/PrintPackingListLuoyang.vue

@@ -131,37 +131,16 @@
              <tbody>
              <template v-for="(itemDatile,index) in item.detailList" :key="index">
                <tr style="width: 100%;">
                  <td colspan="5" style="font-weight: bold">加工品种:</td>
                </tr>
                <tr style="width: 100%;">
                  <td colspan="5"><el-input class="textarea" type="textarea" :autosize="{ minRows: 2, maxRows: 20 }"  v-model="itemDatile.product_name"/></td>
                  <td colspan="1" style="font-weight: bold">加工品种:</td>
                  <td colspan="4"><el-input class="textarea" type="textarea"  :autosize="{ minRows: 2, maxRows: 20 }"  v-model="itemDatile.product_name"/></td>
                </tr>
                <template v-for="(item,index) in itemDatile.detailList" :key="index">
                  <tr style="width: 100%;margin-top: 20px" >
                    <td style="font-size: 9px;height:50px ">{{ item.building_number }}</td>
                  <tr style="width: 100%;margin-top: 20px">
                    <td style="font-size: 10px">{{ item.building_number }}</td>
                    <td style="font-weight: bold">{{ item.width }}</td>
                    <td style="font-weight: bold">{{ item.height }}</td>
                    <td style="font-weight: bold">{{ item.quantity }}</td>
                    <td>{{ item.area }}</td>
                  </tr>
                  <tr  v-if=" (index+1)%10 === 0 || (index+1)===itemDatile.detailList.length"
                       style="border: 0;font-size: 10px"
                       :class="(index+1)%10 === 0 ? 'print-container' : ''">
                    <td colspan="5" style="border: 0;">
                      <div style="display:flex;">
                        <div>地址:洛阳国家高新技术开发区张庄</div>&nbsp;&nbsp;&nbsp;&nbsp;
                        <div>电话:0379-64312861.64331830</div>
                      </div>
                      <div style="display:flex;">
                        <div>http://www.northglass.com</div>&nbsp;&nbsp;&nbsp;&nbsp;
                        <div>传真:0379-64332066</div>
                      </div>
                      <div style="display:flex;">
                        <div>E-mail:luoyang@northglass.com</div>&nbsp;&nbsp;&nbsp;&nbsp;
                        <div>邮编：471003</div>
                      </div>

                    </td>
                  </tr>
                </template>
              </template>
@@ -176,7 +155,23 @@
              </tbody>
              <tfoot >

              <tr style="border: 0;font-size: 10px">
                <td colspan="5" style="border: 0;">
                  <div style="display:flex;">
                    <div>地址:洛阳国家高新技术开发区张庄</div>&nbsp;&nbsp;&nbsp;&nbsp;
                    <div>电话:0379-64312861.64331830</div>
                  </div>
                  <div style="display:flex;">
                    <div>http://www.northglass.com</div>&nbsp;&nbsp;&nbsp;&nbsp;
                    <div>传真:0379-64332066</div>
                  </div>
                  <div style="display:flex;">
                    <div>E-mail:luoyang@northglass.com</div>&nbsp;&nbsp;&nbsp;&nbsp;
                    <div>邮编：471003</div>
                  </div>

                </td>
              </tr>
              </tfoot>
            </table>
          </div>
@@ -225,6 +220,7 @@
    margin: 4mm 5mm 0mm 5mm  /* this affects the margin in the printer settings */

  }

  thead{
    display: table-header-group;
  }
@@ -234,14 +230,14 @@
  tr {
    page-break-inside: avoid;
  }
  .print-container{
    page-break-after: always;
  }

  .foot_tr {

  tfoot {
    display: table-footer-group;
     position: fixed;
    /* position: fixed;
     width: 50%;
     bottom: 0;
     height: 100px;*/
  }

}

 north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedGoodsInventoryMapper.java

@@ -24,6 +24,9 @@

    Map<String,Integer> getPageTotal(Integer offset, Integer pageSize, FinishedGoodsInventory finishedGoodsInventory);

    FlowCard getSelectWarehousingByProcessId(@Param("order_id") String order_id,
                                        @Param("order_number") Integer order_number,
                                        @Param("process_id") String process_id);
    List<FlowCard> getSelectWarehousing(@Param("offset") Integer offset,
                                       @Param("pageSize") Integer pageSize,
                                       @Param("flowCard") FlowCard flowCard);

 north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGoodsInventoryService.java

@@ -113,8 +113,8 @@
            if (!flowCardlist.isEmpty()){
                //获取单号
                String oddNumber= orderNumberSetting("入库");
                for (FlowCard flowCard : flowCardlist) {

                for (FlowCard flowCards : flowCardlist) {
                    FlowCard flowCard = finishedGoodsInventoryMapper.getSelectWarehousingByProcessId(flowCards.getOrder().getOrderId(),flowCards.getOrderNumber(),flowCards.getProcessId());
                    Integer calculateType=flowCard.getOrder().getCalculateType();
                    double deliveryDetailMoney = 0.0;
                    double deliveryDetailArea = 0.0;

 north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml

@@ -583,6 +583,38 @@

    </select>

    <select id="getSelectWarehousingByProcessId" resultMap="selectFlowCard">
        select
        fc.id,
        o.order_id,
        od.building_number,
        od.product_id,
        od.product_name,
        od.width,
        od.height,
        o.creator,
        o.project,
        fc.order_number,
        od.quantity,
        fc.inventory_quantity-fc.received_quantity as inventory_quantity,
        o.area,
        fc.process_id,
        fc.received_quantity,
        o.batch,
        o.calculate_type,
        od.compute_area,
        od.price,
        od.area as areas,
        od.gross_area,
        od.compute_gross_area
        from (select *,min(inventory_quantity) as min_inventory_quantity from pp.flow_card  group by  order_id,order_number,process_id) as fc
        left join sd.order_detail od on fc.order_id=od.order_id and fc.order_number=od.order_number inner join sd.`order` o on
        o.order_id=fc.order_id
        where fc.received_quantity <![CDATA[<]]> fc.min_inventory_quantity and o.create_order>0 and
            fc.order_id=#{order_id} and fc.order_number=#{order_number} and fc.process_id=#{process_id};

    </select>


    <select id="getSelectWarehousing" resultMap="selectFlowCard">
        select