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

廖井涛

2024-07-08 ee87338f0a91cc2105161e3ebc5a6a81794a1da5

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

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

@@ -1,5 +1,5 @@
import axios from 'axios'
import config from '../../config';
import config from '../../config'
import useUserInfoStore from '@/stores/userInfo'
const userStore=useUserInfoStore()
const request = axios.create({

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

@@ -1,3 +1,4 @@
import config from '../../config'
var websock = null;
var global_callback = null;
let isConnect = false; //连接标识 避免重复连接
@@ -6,7 +7,7 @@


var serverPort = "/ws"; // webSocket连接端口
var wsuri = "ws://127.0.0.1:12345/ws";
var wsuri = `ws://${config.webSocketUrl}/ws`

function createWebSocket(callback) {


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

@@ -628,7 +628,9 @@


//初始化判断是否有id传入
onMounted(()=>{
onMounted(async ()=>{
  await initOrder()

  //启用表格拖动选中
  addListener(xGrid.value,gridOptions)
  const str = route.query.orderId || history.state.orderId
@@ -746,8 +748,9 @@



const initOrder = async ()=>{
//页面第一次加载执行
request.get(`/basicData/orderBasicData`).then((res) => {
  await request.get(`/basicData/orderBasicData`).then((res) => {
  if(res.code==200){
    titleSelectJson.value=deepClone(res.data)
    //其他金额
@@ -802,6 +805,7 @@
    ElMessage.warning(res.msg)
  }
})
}

//查询重复订单方法
const selectOrder = (order) => {

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

@@ -16,6 +16,7 @@
import com.example.erp.exception.ServiceException;
import com.example.erp.mapper.sd.*;
import com.example.erp.service.userInfo.SysErrorService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
@@ -34,15 +35,17 @@
    private final OrderGlassDetailMapper orderGlassDetailMapper;
    private final SysErrorService sysErrorService;
    private final OrderOtherMoneyMapper orderOtherMoneyMapper;
    private final ProductMapper productMapper;

    private final OrderProcessDetailMapper orderProcessDetailMapper;
    public OrderService(OrderMapper orderMapper, OrderDetailMapper orderDetailMapper, OrderGlassDetailMapper orderGlassDetailMapper, OrderProcessDetailMapper orderProcessDetailMapper, SysErrorService sysErrorService, OrderOtherMoneyMapper orderOtherMoneyMapper) {
    public OrderService(OrderMapper orderMapper, OrderDetailMapper orderDetailMapper, OrderGlassDetailMapper orderGlassDetailMapper, OrderProcessDetailMapper orderProcessDetailMapper, SysErrorService sysErrorService, OrderOtherMoneyMapper orderOtherMoneyMapper, ProductMapper productMapper) {
        this.orderMapper = orderMapper;
        this.orderDetailMapper = orderDetailMapper;
        this.orderGlassDetailMapper = orderGlassDetailMapper;
        this.orderProcessDetailMapper = orderProcessDetailMapper;
        this.sysErrorService = sysErrorService;
        this.orderOtherMoneyMapper = orderOtherMoneyMapper;
        this.productMapper = productMapper;
    }

    public boolean saveOrder(Map<String,Object> orderMap) throws Exception {
@@ -190,7 +193,9 @@
            OrderDetails.get(i).setOrderNumber(i+1);
            OrderDetails.get(i).setOrderId(orderId);
            OrderDetails.get(i).setPerimeter(Double.valueOf(String.format("%.3f",(OrderDetails.get(i).getWidth()+OrderDetails.get(i).getHeight())*2/1000*OrderDetails.get(i).getQuantity())));
            OrderDetails.get(i).setWeight(1.0);
            Product product = productMapper.selectById(OrderDetails.get(i).getProductId());

            OrderDetails.get(i).setWeight(Double.valueOf(String.format("%.2f",product.getThickness()*OrderDetails.get(i).getWidth()*OrderDetails.get(i).getHeight()/1000000*2.5)));
            if(OrderDetails.get(i).getBendRadius()!=null && OrderDetails.get(i).getBendRadius()!=0){
                //获取弯钢弧度
                Double bendRadius = OrderDetails.get(i).getBendRadius();