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

chenlu

2025-08-05 8a2a32a4de9665afbb39387ec060a19a8434eda8

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

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

@@ -86,7 +86,7 @@
  {field: 'inventoryArea',width: 120, title: t('report.inventoryArea')},
  {field: 'broken_num',width: 90, title: t('reportingWorks.quantityBroken')},
]
let column = [0,1,3,6,7,8,10,11,12,13]
let column = [0,1,3,8,10,11,12,13]


onMounted(()=>{

 north-glass-erp/northglass-erp/src/stores/userInfo.js

@@ -8,7 +8,8 @@
                userName:null,
                userId:null,
                address:null,
                permissions:[]
                permissions:[],
                token:null
            }),
            responseCode:null,
            msg:null

 north-glass-erp/northglass-erp/src/utils/request.js

@@ -15,7 +15,7 @@
request.interceptors.request.use(config => {
    config.headers['Content-Type'] = 'application/json;charset=utf-8';
    if(userStore.user){
        config.headers['satoken'] = userStore.user.token;
        config.headers['satoken'] = localStorage.getItem('saToken');
    }
      // 设置请求头
    return config

 north-glass-erp/northglass-erp/src/utils/requestOptimize.js

@@ -17,7 +17,7 @@
request.interceptors.request.use(config => {
    config.headers['Content-Type'] = 'application/json;charset=utf-8';
    if(userStore.user){
        config.headers['satoken'] = userStore.user.token;
        config.headers['satoken'] = localStorage.getItem('saToken');
    }
      // 设置请求头
    return config

 north-glass-erp/northglass-erp/src/utils/requestTemp.js

@@ -17,7 +17,7 @@
request.interceptors.request.use(config => {
    config.headers['Content-Type'] = 'application/json;charset=utf-8';
    if(userStore.user){
        config.headers['satoken'] = userStore.user.token;
        config.headers['satoken'] = localStorage.getItem('saToken');
    }
      // 设置请求头
    return config

 north-glass-erp/northglass-erp/src/views/LoginView.vue

@@ -64,6 +64,7 @@
          userForm).then((res) => {
        if(res['code']==200 && res['data']){
          store.$patch({user:res.data})
          localStorage.setItem('saToken', store.user.token)
          orderInfo.clearSelectDate()
          router.push('/main')
          ElMessage.success(t('login.loginSuccessful'))

 north-glass-erp/northglass-erp/src/views/sd/basicData/CreateBasicData.vue

@@ -229,6 +229,11 @@
          <el-option  :label="$t('orderBasicData.laminatingProcessB')" value="stepB" />
          <el-option  :label="$t('orderBasicData.laminatingProcessC')" value="stepC" />
          <el-option  :label="$t('orderBasicData.laminatingProcessD')" value="stepD" />

<!--          <el-option  :label="$t('orderBasicData.laminatingProcessC')" value="stepA" />夹胶工序-->
<!--          <el-option  :label="$t('orderBasicData.laminatingProcessA')" value="stepB" />-->
<!--          <el-option  :label="$t('orderBasicData.laminatingProcessD')" value="stepC" />-->
<!--          <el-option  :label="$t('orderBasicData.laminatingProcessB')" value="stepD" />-->
        </el-select>
      </el-col>
    </el-row>

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

@@ -1108,7 +1108,7 @@

    public Map<String, Object> mesOriginalSelect() {
        Map<String, Object> map = new HashMap<>();
        map.put("data", materialInventoryMapper.getSelectMaterialInventoryMes());
        map.put("originalList", materialInventoryMapper.getSelectMaterialInventoryMes());
        return map;
    }


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

@@ -1296,19 +1296,18 @@

    <select id="getSelectMaterialInventoryMes">
        select
            mi.id,
            mi.material_code AS materialCode,
            mi.producer,
            sum(mi.available_quantity) AS availableQuantity,
            sum(mi.available_quantity) AS quantity,
            JSON_UNQUOTE(JSON_EXTRACT(ms.json, '$.width')) AS width,
            JSON_UNQUOTE(JSON_EXTRACT(ms.json, '$.height')) AS height,
            JSON_UNQUOTE(JSON_EXTRACT(ms.json, '$.thickness')) AS thickness,
            JSON_UNQUOTE(JSON_EXTRACT(ms.json, '$.name')) AS name,
            JSON_UNQUOTE(JSON_EXTRACT(ms.json, '$.model')) AS model,
            JSON_UNQUOTE(JSON_EXTRACT(ms.json, '$.unit')) AS unit
            JSON_UNQUOTE(JSON_EXTRACT(ms.json, '$.model')) AS model
        from mm.material_inventory mi left join mm.material_store ms on mi.material_code=ms.id
        where mi.available_quantity>0
        group by mi.material_code
        order by mi.id desc
    </select>

</mapper>