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

chenlu

2025-08-13 08c5c28ff50e82a9ee99409e547a9e2558c22c3a

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

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

@@ -84,12 +84,12 @@
  {field: 'glassQuantity', width: 90,title: t('order.glassQuantity')},
  {field: 'grossArea',slots: { default: 'show'}, width: 90,title: t('order.area')},
  {field: 'shippedQuantity',slots: { default: 'show'},width: 120, title: t('delivery.deliveryQuantity')},
  {field: 'inventory',slots: { default: 'show'},width: 120, title: t('productStock.inventoryQuantity')},
  {field: 'inventoryArea',slots: { default: 'show'},width: 120, title: t('report.inventoryArea')},
  {field: 'Storage',slots: { default: 'show'},width: 120, title: t('report.inventoryNum')},
  // {field: 'inventoryArea',slots: { default: 'show'},width: 120, title: t('report.inventoryArea')},
  {field: 'StorageArea',slots: { default: 'show'},width: 120, title: t('report.StorageArea')},
  {field: 'broken_num',width: 90, title: t('reportingWorks.quantityBroken')},
]
let column = [0,1,3,8,10,11,12,13,14]
let column = [0,1,3,8,10,11,12,14]
let orderType = ref(1)

onMounted(()=>{
@@ -146,7 +146,7 @@
      gridOptions.columns.forEach(item =>{
        item.filterMethod = filterChanged
      })
      list.value = ['quantity','inventory','inventoryArea','gross_area','shippedQuantity','glassQuantity','StorageArea']
      list.value = ['quantity','Storage','gross_area','shippedQuantity','glassQuantity','StorageArea']
      title.value = res.data.title
      res.data.title.forEach((item,index) =>{
        list.value.push('reportWorkQuantity.'+item.process)

 north-glass-erp/northglass-erp/src/views/sd/bom/MaterialBOM.vue

@@ -399,7 +399,7 @@
      id="print"
      v-model="dialogTableVisible"
      destroy-on-close
      style="width: 40%;height:40%;"
      style="width: 400px;height:40%;"
      :close-on-click-modal="false"
      :close-on-press-escape="false"
  >
@@ -429,10 +429,11 @@
      </el-form-item>

      <el-form-item>
        <el-button type="primary" @click="submitForm(ruleFormRef)">
        <el-button style="margin-left: 235px" @click="resetForm(ruleFormRef)">重置</el-button>
        <el-button style="float: right"  type="primary" @click="submitForm(ruleFormRef)">
          提交
        </el-button>
        <el-button @click="resetForm(ruleFormRef)">重置</el-button>

      </el-form-item>
    </el-form>


 north-glass-erp/northglass-erp/src/views/sd/bom/OrderBOM.vue

@@ -657,19 +657,104 @@
        id="print"
        v-model="dialogTableVisible"
        destroy-on-close
        style="width: 90%;height:90%;margin-top: 3vh "
        style="width: 600px;height: 600px"
        :close-on-click-modal="false"
        :close-on-press-escape="false"
    >
        <el-card style="max-width: 480px">
          <template #header>
            <div class="card-header">
              <span>产品1</span>
            </div>
          </template>
          <p v-for="o in 4" :key="o" class="text item">{{ '用料 ' + o +":xx元" }}</p>
          <template #footer>合计xx元</template>
        </el-card>
      <el-card style="max-width: 480px;margin-left: 45px">
        <template #header>
          <div class="card-header">
            <span style="font-weight: bold">成品合计</span>
            &nbsp &nbsp &nbsp
            <span>面积：1312.48㎡</span>
            &nbsp &nbsp &nbsp
            <span>数量：200</span>
            &nbsp &nbsp &nbsp
            <span>周长：5325.7m</span>
          </div>
        </template>
        <el-row >
          <el-col :span="8">6mm超白：</el-col>
          <el-col :span="8">3149.72㎡</el-col>
        </el-row>
        <el-row>
          <el-col :span="8">8mm超白：</el-col>
          <el-col :span="8">787.72㎡</el-col>
        </el-row>
        <el-row>
          <el-col :span="8">铝框：</el-col>
          <el-col :span="8">2662.85m</el-col>
        </el-row>
        <el-row>
          <el-col :span="8">0.76PVB：</el-col>
          <el-col :span="8">1706.22㎡</el-col>
        </el-row>
        <el-row>
          <el-col :span="8">其他：</el-col>
          <el-col :span="8">5</el-col>
        </el-row>
      </el-card>


      <el-card style="max-width: 480px;margin-left: 45px;margin-top: 20px">
        <template #header>
          <div class="card-header">
            <span style="font-weight: bold">6mm超白钢化+12A+6mm超白钢化+0.76PVB+6mm超白钢化</span>
            <br/>
            <span>面积：656.24㎡</span>
            &nbsp &nbsp &nbsp
            <span>数量：100</span>
            &nbsp &nbsp &nbsp
            <span>周长：2662.85m</span>
          </div>
        </template>
        <el-row >
          <el-col :span="8">6mm超白：</el-col>
          <el-col :span="8">2362.464㎡</el-col>
        </el-row>
        <el-row>
          <el-col :span="8">铝框：</el-col>
          <el-col :span="8">2662.85m</el-col>
        </el-row>
        <el-row>
          <el-col :span="8">0.76PVB：</el-col>
          <el-col :span="8">853.11㎡</el-col>
        </el-row>
        <el-row>
          <el-col :span="8">其他：</el-col>
          <el-col :span="8">5</el-col>
        </el-row>

<!--          <template #footer>合计xx元</template>-->
      </el-card>

      <el-card style="max-width: 480px;margin-left: 45px;margin-top: 20px">
        <template #header>
          <div class="card-header">
            <span style="font-weight: bold">8mm超白钢化+0.76PVB+6mm超白钢化</span>
            <br/>
            <span>面积：656.24㎡</span>
            &nbsp &nbsp &nbsp
            <span>数量：100</span>
            &nbsp &nbsp &nbsp
            <span>周长：2662.85m</span>
          </div>
        </template>
        <el-row >
          <el-col :span="8">6mm超白：</el-col>
          <el-col :span="8">787.72㎡</el-col>
        </el-row>
        <el-row>
          <el-col :span="8">8mm超白：</el-col>
          <el-col :span="8">787.72㎡</el-col>
        </el-row>
        <el-row>
          <el-col :span="8">0.76PVB：</el-col>
          <el-col :span="8">853.11㎡</el-col>
        </el-row>

        <!--          <template #footer>合计xx元</template>-->
      </el-card>
    </el-dialog>


@@ -702,6 +787,8 @@
  background-color: orangered;
  border-color: orangered;
}

.el-row{
  text-align: center
}

</style>

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

@@ -159,12 +159,12 @@
            //判断夹胶和夹胶后工序
            //Objects.equals(basicData.getNickname(), "stepA") || Objects.equals(basicData.getNickname(), "stepC")
            if(Objects.equals(basicData.getNickname(), "stepA") || Objects.equals(basicData.getNickname(), "stepC")){
                clos.put(uniqueList.get(i).get("process"), 16+i);
                clos.put(uniqueList.get(i).get("process"), 15+i);
            }
            //判断中空和中空后工序
            //Objects.equals(basicData.getNickname(), "stepB") || Objects.equals(basicData.getNickname(), "stepD")
            if(Objects.equals(basicData.getNickname(), "stepB") || Objects.equals(basicData.getNickname(), "stepD")){
                columns.add(16+i);
                columns.add(15+i);
            }
        }


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

@@ -187,14 +187,12 @@

               c.quantity-ifnull(c.termination_quantity,0) as quantityShow,
               (c.quantity-ifnull(c.termination_quantity,0))*a.compute_area as grossAreaShow,
               ifnull(f.inventory, 0) as inventoryShow,
               round(ifnull(f.inventory, 0) * a.compute_area, 2) as inventoryAreaShow, -- 库存面积
               ifnull(c.received_quantity, 0) as StorageShow,
               ifnull(dd.quantity, 0) as shippedQuantityShow, -- 发货数量
               (ifnull(c.received_quantity, 0))*a.compute_area  as StorageAreaShow,-- 入库面积

               if(c.technology_number=1,(c.quantity-ifnull(c.termination_quantity,0))*a.compute_area,0) as grossArea,
               if(c.technology_number=1,ifnull(f.inventory, 0) ,0)                        as inventory,
               if(c.technology_number=1,round(ifnull(f.inventory, 0) * a.compute_area, 2),0)      as inventoryArea,
               if(c.technology_number=1,ifnull(c.received_quantity, 0) ,0)                        as Storage,
               if(c.technology_number=1,ifnull(dd.quantity, 0) ,0)                          as shippedQuantity,
               if(c.technology_number=1,(ifnull(c.received_quantity, 0))*a.compute_area,0)  as StorageArea,

@@ -213,8 +211,8 @@
                               and c.technology_number = b.technology_number
                 left join sd.`order` as d
                           on c.order_id = d.order_id
                 left join mm.finished_goods_inventory as f
                           on c.order_id = f.order_id and f.order_number = c.order_number
#                  left join mm.finished_goods_inventory as f
#                            on c.order_id = f.order_id and f.order_number = c.order_number
                 left join sd.delivery_detail as dd on dd.order_id = a.order_id and dd.order_number = a.order_number
                 left join (SELECT process_id,
                                   order_number,