~admin/ERP_override.git

parent: 366793db | 补丁 | 提交 | show whitespace

Merge branch 'master' of https://gitee.com/a1536384743/erp_-override

chenlu

2024-04-16 5e175cf489df0a066d9d6814ed546638e9c7dda1

Merge branch 'master' of https://gitee.com/a1536384743/erp_-override

6个文件已修改

8个文件已删除

	.idea/.gitignore	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	.idea/ERP_override.iml	9 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	.idea/compiler.xml	18 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	.idea/encodings.xml	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	.idea/jarRepositories.xml	30 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	.idea/misc.xml	13 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	.idea/modules.xml	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	.idea/vcs.xml	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/config.js	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/ReturnToStorageCreate.vue	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/application.yml	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/target/classes/application.yml	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/target/erp-0.0.1-SNAPSHOT.jar.original	补丁 \| 查看 \| 原始文档 \| blame \| 历史

 .idea/.gitignore

File was deleted

 .idea/ERP_override.iml

File was deleted

 .idea/compiler.xml

File was deleted

 .idea/encodings.xml

File was deleted

 .idea/jarRepositories.xml

File was deleted

 .idea/misc.xml

File was deleted

 .idea/modules.xml

File was deleted

 .idea/vcs.xml

File was deleted

 north-glass-erp/northglass-erp/config.js

@@ -1,4 +1,4 @@
export default {
  serverUrl:"10.153.19.150:8086"
  serverUrl:"localhost:8086"
  //serverUrl:"res.abeim.cn"
}

 north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/ReturnToStorageCreate.vue

@@ -135,7 +135,6 @@
        //根据审核状态显示审核按钮或者是反审按钮
        value.value='原片|辅料'
        getStoreWork()
        console.log(res.data)
        if(titleUploadData.value.reviewedState!==0){
          gridOptions.toolbarConfig.buttons[1].disabled = true
          gridOptions.toolbarConfig.buttons[0].disabled = true
@@ -204,7 +203,6 @@
  request.get(`/BasicWarehouse/BasicWarehouseTypes/库存组织|材料返库类型`).then((res) => {

    if(res.code==200){
      console.log(res.data)
      titleSelectJson.value=deepClone(res.data)
      // for(let i=0;i<titleSelectJson.value.inventoryOrganization.length;i++){
      //   this.$set(this.produceList[i], "inventoryOrganization", titleSelectJson.value["inventoryOrganization"][i].operateTypeName);
@@ -227,7 +225,6 @@
  filterData.value.type=value.value
  request.get(`/BasicWarehouse/BasicWarehouseType/${value.value}`).then((res) => {
    if(res.code==200){
      console.log(res.data)
      gridOptions.columns=[]
      BasicData.value = res.data
      //添加列
@@ -260,7 +257,6 @@
  request.post(`/MaterialStore/getSelectMaterialStore/1/100`,filterData.value).then((res) => {

    if(res.code==200){
      console.log(res.data)
      materialStore.value=[]
      for (let i=0;i<res.data.data.length;i++){
        materialStore.value[i]=(res.data.data[i])

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

@@ -159,6 +159,7 @@
    pageTotal.value = res.data.total
    produceList = produceList.value.concat(deepClone(res.data.data))
    xGrid.value.reloadData(produceList)
    console.log(produceList)
    gridOptions.loading = false
  } else {
    ElMessage.warning(res.msg)

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

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

 north-glass-erp/target/classes/application.yml

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

 north-glass-erp/target/erp-0.0.1-SNAPSHOT.jar.original

Binary files differ

			@@ -1,4 +1,4 @@
			export default {
			serverUrl:"10.153.19.150:8086"
			serverUrl:"localhost:8086"
			//serverUrl:"res.abeim.cn"
			}

			@@ -135,7 +135,6 @@
			//根据审核状态显示审核按钮或者是反审按钮
			value.value='原片\|辅料'
			getStoreWork()
			console.log(res.data)
			if(titleUploadData.value.reviewedState!==0){
			gridOptions.toolbarConfig.buttons[1].disabled = true
			gridOptions.toolbarConfig.buttons[0].disabled = true
			@@ -204,7 +203,6 @@
			request.get(`/BasicWarehouse/BasicWarehouseTypes/库存组织\|材料返库类型`).then((res) => {

			if(res.code==200){
			console.log(res.data)
			titleSelectJson.value=deepClone(res.data)
			// for(let i=0;i<titleSelectJson.value.inventoryOrganization.length;i++){
			// this.$set(this.produceList[i], "inventoryOrganization", titleSelectJson.value["inventoryOrganization"][i].operateTypeName);
			@@ -227,7 +225,6 @@
			filterData.value.type=value.value
			request.get(`/BasicWarehouse/BasicWarehouseType/${value.value}`).then((res) => {
			if(res.code==200){
			console.log(res.data)
			gridOptions.columns=[]
			BasicData.value = res.data
			//添加列
			@@ -260,7 +257,6 @@
			request.post(`/MaterialStore/getSelectMaterialStore/1/100`,filterData.value).then((res) => {

			if(res.code==200){
			console.log(res.data)
			materialStore.value=[]
			for (let i=0;i<res.data.data.length;i++){
			materialStore.value[i]=(res.data.data[i])

			@@ -159,6 +159,7 @@
			pageTotal.value = res.data.total
			produceList = produceList.value.concat(deepClone(res.data.data))
			xGrid.value.reloadData(produceList)
			console.log(produceList)
			gridOptions.loading = false
			} else {
			ElMessage.warning(res.msg)

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