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

chenlu

3 天以前 f7ca9752b8cc4d81d75a23bbcd89227a2e3abe69

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

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

@@ -88,13 +88,12 @@
          })



          const errMap = await $grid.validate(true)
          if (errMap) {
            ElMessage.error(t('basicData.msg.checkoutLose'))
            return
          }
          //emit('getParent')
          emit('getParent')
          break
        }
      }

 north-glass-erp/northglass-erp/src/stores/sd/companySet/ÉϺ£±±²£.js

@@ -3,6 +3,7 @@
export default defineStore('companyInfo', {

    state: () => ({
        sizeCheck: false,//尺寸校验，true开启，false关闭
        position:{
            outside:'(内)',
            inside:'(外)',

 north-glass-erp/northglass-erp/src/stores/sd/companySet/Ìì½ò±±²£.js

@@ -3,6 +3,7 @@
export default defineStore('companyInfo', {

    state: () => ({
        sizeCheck: false,//尺寸校验，true开启，false关闭
        position:{
            outside:'(内)',
            inside:'(外)',

 north-glass-erp/northglass-erp/src/stores/sd/companySet/³£ÖݼªÀû.js

@@ -3,6 +3,7 @@
export default defineStore('companyInfo', {

    state: () => ({
        sizeCheck: false,//尺寸校验，true开启，false关闭
        position:{
            outside:'(内)',
            inside:'(外)',

 north-glass-erp/northglass-erp/src/stores/sd/companySet/н®ºãöÎ.js

@@ -3,6 +3,7 @@
export default defineStore('companyInfo', {

    state: () => ({
        sizeCheck: false,//尺寸校验，true开启，false关闭
        position:{
            outside:'(内)',
            inside:'(外)',

 north-glass-erp/northglass-erp/src/stores/sd/companySet/ÂåÑô±±²£.js

@@ -3,6 +3,7 @@
export default defineStore('companyInfo', {

    state: () => ({
        sizeCheck: false,//尺寸校验，true开启，false关闭
        position:{
            outside:'(内)',
            inside:'(外)',

 north-glass-erp/northglass-erp/src/stores/sd/companySet/ÎÂÖݾÞÐÇ.js

@@ -3,6 +3,7 @@
export default defineStore('companyInfo', {

    state: () => ({
        sizeCheck: true,//尺寸校验，true开启，false关闭
        position:{
            outside:'(外)',
            inside:'(内)',

 north-glass-erp/northglass-erp/src/stores/sd/companySet/½ð»ªÌì³É.js

@@ -3,6 +3,7 @@
export default defineStore('companyInfo', {

    state: () => ({
        sizeCheck: false,//尺寸校验，true开启，false关闭
        position:{
            outside:'(内)',
            inside:'(外)',

 north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue

@@ -83,6 +83,7 @@
  otherMoneyRemarks:'',
  processingNote:t('order.processingNote')+':',
  createOrder:0,
  sizeCheck:null,
  creatorId:userStore.user.userId,
  creator:userStore.user.userName,
})
@@ -1005,7 +1006,13 @@
        'name': t('order.saveHeader')}
      gridOptions.toolbarConfig.buttons.push(buttonTitle)
      //取消工艺按钮禁用
      gridOptions.toolbarConfig.buttons[1].disabled = false
      if(!company.sizeCheck  || (company.sizeCheck && titleUploadData.value.sizeCheck === 1)){
        gridOptions.toolbarConfig.buttons[1].disabled = false
      }




      //工艺审核后保存按钮禁用
      if(res.data.order.processReview === 2){
        gridOptions.toolbarConfig.buttons[4].disabled = true
@@ -1357,7 +1364,19 @@
}

const gaveOrderSizeCheck = () => {
  reviewOrder(2)
  sizeCheck()
}
const sizeCheck = () => {
  request.post(`/order/sizeCheck/${titleUploadData.value.orderId}`).then(res =>{
    if(res.data===1){
      ElMessage.success(t('basicData.msg.ReviewSuccess'))
      router.push({
        path:'/main/order/createOrder',
        query:{
          orderId:titleUploadData.value.orderId,
          random:Math.random()}})
    }
  })
}

let projects = ref([])

 north-glass-erp/src/main/java/com/example/erp/controller/sd/OrderController.java

@@ -289,6 +289,12 @@
        return  Result.success(orderService.processAttributeConfig());
    }

    @ApiOperation("查询工艺属性配置")
    @PostMapping("/sizeCheck/{orderId}")
    @SaCheckPermission("createOrder.add")
    public Result sizeCheck(@PathVariable String orderId)  {
        return  orderService.sizeCheck(orderId);
    }


}

 north-glass-erp/src/main/java/com/example/erp/entity/sd/Order.java

@@ -102,6 +102,7 @@
    private LocalDate updateTime;
    @ExcelProperty("修改版本号")
    private Integer version;
    private Integer sizeCheck;
    @TableField(select = false,exist = false)
    private Integer goodsQuantity;
    @TableField(select = false,exist = false)

 north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java

@@ -9,7 +9,9 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.example.erp.common.Constants;
import com.example.erp.common.Result;
import com.example.erp.dto.sd.OrderDTO;
import com.example.erp.dto.sd.OrderSearchDTO;
import com.example.erp.entity.sd.*;
@@ -1113,4 +1115,12 @@
        map.put("data",processList);
        return map;
    }

    public Result sizeCheck(String orderId) {

        return Result.success(
                orderMapper.update(null,
                        new UpdateWrapper<Order>().set("size_check",1).eq("order_id",orderId))
        );
    }
}