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

chenlu

2024-06-12 1d4bb098aa30118cb3eb5b6b38cdeef641a783ae

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

# Conflicts:
#	north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java
#	north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java
#	north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml

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

@@ -123,7 +123,7 @@
    useKey: true
  },
  filterConfig: {   //筛选配置项
    // remote: true
                    // remote: true
  },
  customConfig: {
    storage: true
@@ -179,12 +179,12 @@

  toolbarConfig: {
    buttons: [
        {code: 'print', name: '打印流程卡', status: 'primary'},
        {code: 'printLabel', name: '打印标签', status: 'primary'},
      {code: 'print', name: '打印流程卡', status: 'primary'},
      {code: 'printLabel', name: '打印标签', status: 'primary'},
    ],
    // import: false,
    // export: true,
     //print: true,
    //print: true,
    zoom: true,
    custom: true
  },
@@ -209,7 +209,7 @@
const gridEvents = {
  toolbarButtonClick ({ code}) {
    const $grid = xGrid.value
     selectRecords = $grid.getCheckboxRecords()
    selectRecords = $grid.getCheckboxRecords()
    if ($grid) {
      switch (code) {
        case 'print': {
@@ -463,7 +463,7 @@
        title="流程卡打印"
        style="width: 80%;height:75% ">
      <PrintProcess :printList="selectRecords"
          style="width: 100%;height: 100%" />
                    style="width: 100%;height: 100%" />
    </el-dialog>

    <el-dialog
@@ -472,7 +472,7 @@
        title="标签打印"
        style="width: 80%;height:75% ">
      <PrintLabel :printList="selectRecords"
                    style="width: 100%;height: 100%" />
                  style="width: 100%;height: 100%" />
    </el-dialog>

    <el-dialog

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

@@ -18,6 +18,11 @@
const data = ref({
  printList: []
})
const setupData = ref({
})
let printSetupData = {
  printState:''
}

const {currentRoute} = useRouter()
const route = currentRoute.value
@@ -44,6 +49,15 @@
    }

)

request.post(`/processCard/printSetup`, setupData.value).then((res) => {
  if (res.code == 200) {
    printSetupData = deepClone(res.data.data)
  } else {
    ElMessage.warning(res.msg)
    router.push("/login")
  }
})



@@ -89,11 +103,19 @@
  <el-button id="printButton" @click="printFlowCard();">打印</el-button>
  <div id="printFlowCard" >
    <div id="entirety" v-for="(item,id) in labelList" >
      <div class="row1">{{ item.customer_name }}</div>
      <div class="row2">{{ item.order_id }} {{ item.type_name }}</div>
      <div class="row3">{{item.child_width}}*{{item.child_height}}={{item.quantity}}</div>
      <div class="row5">{{item.project}} {{ item.remarks }}</div>
      <div class="row6">{{item.glass_child}} {{item.processing_note}}</div>
      <div v-show="printSetupData[0].printState" class="row1">{{ item.customer_name }}</div>
      <div v-show="printSetupData[6].printState || printSetupData[7].printState" class="row2">
        <span v-show="printSetupData[6].printState">{{ item.order_id }}</span>
        <span v-show="printSetupData[7].printState">{{ item.type_name }}</span>
      </div>
      <div v-show="printSetupData[2].printState" class="row3">{{item.child_width}}*{{item.child_height}}={{item.quantity}}</div>
      <div v-show="printSetupData[1].printState || printSetupData[3].printState" class="row5">
        <span v-show="printSetupData[1].printState">{{item.project}}</span>
        <span v-show="printSetupData[3].printState">{{ item.remarks }}</span>
      </div>
      <div v-show="printSetupData[5].printState || printSetupData[4].printState" class="row6">
        <span v-show="printSetupData[5].printState">{{item.glass_child}}</span>
        <span v-show="printSetupData[4].printState">{{item.processing_note}}</span></div>
    </div>
  </div>

@@ -136,6 +158,10 @@
  font-weight: bold;
  height: 16px;
}
span {
  font-size: 8pt;
  font-weight: bold;
}

.row3 {
  margin-top: -5px;

 north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java

@@ -3,6 +3,7 @@
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.example.erp.common.Constants;
import com.example.erp.entity.pp.FlowCard;
import com.example.erp.entity.pp.PrintSetup;
import com.example.erp.entity.sd.DeliveryDetail;
import com.example.erp.entity.sd.Order;
import com.example.erp.common.Result;
@@ -217,4 +218,12 @@

        }
    }

    @ApiOperation("打印标签设置查询")
    @SaCheckPermission("PrintFlowCard.search")
    @PostMapping  ("/printSetup")
    public Result printSetup(@RequestBody PrintSetup printSetup){
        return Result.seccess(flowCardService.printSetup(printSetup));

    }
}

 north-glass-erp/src/main/java/com/example/erp/entity/pp/PrintSetup.java

New file
@@ -0,0 +1,18 @@
package com.example.erp.entity.pp;

import lombok.Data;

import java.time.LocalDate;

@Data
public class PrintSetup {
    //自增id
    private Integer id;
    //打印标签类型
    private String printType;
    //打印标签名称
    private String printTypeName;
    //状态
    private String printState;

}

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

@@ -85,4 +85,6 @@
    List<Map<String, String>> printFlowCardDetailsMp(String processId, String technologyNumber, FlowCard flowCard);

    Boolean printSortMp(String processId, Integer orderNumber, Integer technologyNumber, Integer sort);

    List<Map<String, String>> selectPrintSetup(PrintSetup printSetup);
}

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

@@ -282,4 +282,10 @@
        }
        return true;
    }

    public Map<String, Object> printSetup(PrintSetup printSetup) {
        Map<String, Object> map = new HashMap<>();
        map.put("data", flowCardMapper.selectPrintSetup(printSetup));
        return map;
    }
}

 north-glass-erp/src/main/resources/application.yml

@@ -11,22 +11,22 @@
      strict: false #设置严格模式,默认false不启动. 启动后在未匹配到指定数据源时候回抛出异常,不启动会使用默认数据源.
      datasource:
        user_info:
          url: jdbc:mysql://10.153.19.150:3306/erp_user_info?serverTimezone=GMT%2b8
          url: jdbc:mysql://192.168.1.108:3306/erp_user_info?serverTimezone=GMT%2b8
          username: root
          password: beibo.123/
          driver-class-name: com.mysql.cj.jdbc.Driver
        sd:
          url: jdbc:mysql://10.153.19.150:3306/sd?serverTimezone=GMT%2b8&allowMultiQueries=true
          url: jdbc:mysql://192.168.1.108:3306/sd?serverTimezone=GMT%2b8&allowMultiQueries=true
          username: root
          password: beibo.123/
          driver-class-name: com.mysql.cj.jdbc.Driver
        mm:
          url: jdbc:mysql://10.153.19.150:3306/mm?serverTimezone=GMT%2b8
          url: jdbc:mysql://192.168.1.108:3306/mm?serverTimezone=GMT%2b8
          username: root
          password: beibo.123/
          driver-class-name: com.mysql.cj.jdbc.Driver
        pp:
          url: jdbc:mysql://10.153.19.150:3306/pp?serverTimezone=GMT%2b8
          url: jdbc:mysql://192.168.1.108:3306/pp?serverTimezone=GMT%2b8
          username: root
          password: beibo.123/
          driver-class-name: com.mysql.cj.jdbc.Driver

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

@@ -569,4 +569,12 @@
          and order_number=#{orderNumber}
          and technology_number = #{technologyNumber}
    </update>

<select id="selectPrintSetup">
        select id,
               print_type as printType,
               print_type_name as printTypeName,
               print_state as printState
        from pp.print_setup
    </select>
</mapper>