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

廖井涛

2024-06-25 a7b13361d1faa45df2e0771ebb0c1b1ada76ac84

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

 north-glass-erp/northglass-erp/src/components/pp/TagStyle.vue

@@ -20,6 +20,9 @@
  project:'order.project',
  orderType:'order.orderType',
  customerName:'order.customers',
  productName:'order.product',
  edgingType:"order.edgingType",
  buildingNumber:'order.buildingNumber',
  icon:'order.icon',
  orderClassify:'order.orderClassify',
  packType:'order.packType',
@@ -27,15 +30,11 @@
  batch:'order.batch',
  salesman:'order.salesman',
  alType:'order.alType',
  money:'order.money',
  contractId:'order',
  customerBatch:'order',
  contacts:'order',
  contactNumber:'order',
  deliveryAddress:'order',
  processingNote:'order',
  verifier:'order',
  productName:'order.orderDetail',
  customerBatch:'order.customerBatch',
  contacts:'order.contacts',
  deliveryAddress:'order.deliveryAddress',
  processingNote:'order.processingNote',

})

const tags = ref([])
@@ -188,7 +187,10 @@
            </el-select>

            <el-button v-if="tag.id!==null" @click="close" type="primary" circle  :icon="CloseBold"/>
            <el-input placeholder="宽" v-model="tag.tagWidth" style="width: 40px"/>
            <el-input placeholder="高" v-model="tag.tagHeight" style="width: 40px"/>
          </el-row>

        </el-header>
        <el-main>
          <VueDraggable

 north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabel.vue

@@ -42,7 +42,7 @@
          labelList = dataList[0]
          for (let i = 0; i < list.value.length; i++) {
            let count= list.value[i].data.length
            for (let j = 0; j < 1; j++) {
            for (let j = 0; j < count; j++) {
              for (let k = 0; k < list.value[i].data[j].quantity; k++){
                lastList.value.push(list.value[i].data[j])
              }
@@ -104,12 +104,12 @@
        <div class="row4">{{faceOrientation}}</div>
        <div v-for="(item,id) in labelList"  class="contentRow">
          <div class="row1">{{ item.title }}:</div>
          <div class="row2">{{ item1.order[item.name] }}</div>
          <div class="row2">{{ item1[item.name] }}</div>

        </div>
        <div class="row3">
          <label>W:{{ item1.width }}</label>
          &nbsp;&nbsp;
          &nbsp;&nbsp;&nbsp;
          <label>H:{{ item1.height }}</label>
        </div>


 north-glass-erp/northglass-erp/src/views/pp/processCard/PrintFlowCard.vue

@@ -74,7 +74,7 @@
let pageState = null

//室内室外面
const stateValue = ref(t('processCard.thisIsTheIndoorSurface'))
const stateValue = ref('')
const stateOptions = [
  {
    value: t('processCard.thisIsTheIndoorSurface'),
@@ -506,7 +506,7 @@
      />
    </el-select>
    &nbsp;
    <el-select v-model="stateValue" class="m-2" :placeholder="stateOptions[0].label" style="width: 140px">
    <el-select v-model="stateValue" class="m-2" placeholder='' clearable allow-create filterable style="width: 140px">
      <el-option
          v-for="item in stateOptions"
          :key="item.value"

 north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java

@@ -95,7 +95,7 @@

    List<Map<String, Object>> getCustomLabelDetailMp(String name, String form, String id, FlowCard flowCard);

    List<Order> getPrintCustomData(String processId, Integer technologyNumber);
    List<Map<String, Object>>  getPrintCustomData(String processId, Integer technologyNumber);

    Integer getPrintLabelCount(String processId, Integer technologyNumber);
}

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

@@ -603,31 +603,37 @@
        <result column="delivery_address" property="order.deliveryAddress"/>
        <result column="processing_note" property="processingNote"/>
        <result column="quantity" property="quantity"/>
        <result column="edging_type" property="edgingType"/>
        <result column="product_name" property="productName"/>
        <result column="building_number" property="buildingNumber"/>
    </resultMap>

    <select id="getPrintCustomData" resultMap="orderDetial">
        select o.order_id,
    <select id="getPrintCustomData" >
        select o.order_id as orderId,
               project,
               customer_id,
               customer_name,
               order_type,
               order_classify,
               customer_id as customerId,
               customer_name as customerName,
               order_type as  orderType,
               order_classify as orderClassify,
               batch,
               o.icon,
               pack_type,
               delivery_date,
               al_type,
               pack_type as packType,
               delivery_date as deliveryDate,
               al_type as alType,
               money,
               contract_id,
               customer_batch,
               contract_id as contractId,
               customer_batch customerBatch,
               contacts,
               delivery_address,
               od.processing_note,
                width,
                height,
               delivery_address as deliveryAddress,
               od.processing_note as processingNote,
               width,
               height,
               od.quantity,
               od.order_number,
               fc.technology_number
               od.order_number as orderNumber,
               fc.technology_number as technologyNumber,
               od.building_number as buildingNumber,
               od.product_name as productName,
               od.edging_type as edgingType

        from sd.order as o
                 left join sd.order_detail as od on o.order_id = od.order_id