其他金额功能添加，以及修改xml文件名称

guoyuji

2024-04-22 b5244bec8ebfe724d844c41331d0ce3b28833356

其他金额功能添加，以及修改xml文件名称

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

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

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

@@ -72,17 +72,20 @@
let otherMoney = ref(null)

const gridOptions = reactive({
  loading:false,
  border:  "full",//表格加边框
  keepSource: true,//保持源数据
  align: 'center',//文字居中
  stripe:true,//斑马纹
  rowConfig: {isCurrent: true, isHover: true,height: 30},//鼠标移动或选择高亮
  //virtualScroll: true, // 开启虚拟滚动功能
  id: 'OrderList',
  showFooter: true,//显示脚
  printConfig: {},
  importConfig: {},
  exportConfig: {},
  scrollY:{ enabled: true },//开启虚拟滚动
  scrollY:{ enabled: true,gt:15 },//开启虚拟滚动
  scrollX:{ enabled: true,gt:30 },//开启虚拟滚动
  showOverflow:true,
  menuConfig: {
    body: {
@@ -435,6 +438,7 @@

//初始化判断是否有id传入
onMounted(()=>{
  gridOptions.loading=true
  //启用表格拖动选中
  addListener(xGrid.value,gridOptions)
  const str = route.query.orderId || history.state.orderId
@@ -495,15 +499,17 @@
      orderDetails.forEach(item => {
        item.otherColumns = JSON.parse(item.otherColumns)
      })

      //加载副表数据
      otherMoney.value =res.data.orderOtherMoneyList
          //加载副表数据
      xGrid.value.reloadData(orderDetails)
      gridOptions.loading=false
    }else{
      ElMessage.error(res.msg)
    }
  })
})

//作废订单
const cancelOrder = () => {
  request.post(`/order/cancelOrder/${titleUploadData.value.orderId}`).then((res) =>{
    if (res.code== 200){
@@ -695,7 +701,9 @@
   }else if(column.property.indexOf('otherColumns.M')>-1){
     let quantity = 0
     xGrid.value.getTableData().fullData.forEach(item => {
       quantity += item.quantity*(getNestedProperty(item,column.property)*1)
       let orderQuantity = isNaN(item.quantity) ? 0 : item.quantity
       let value = isNaN((getNestedProperty(item,column.property)*1)) ? 0 : (getNestedProperty(item,column.property)*1)
       quantity += orderQuantity*value
     })
     if(!isNaN(quantity)){
       otherMoney.value.forEach(item => {

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

@@ -17,5 +17,7 @@
    private Double quantity;
    private Double price;
    private Double money;
    @TableField(select = false,exist= false)
    private String alias;
    private LocalDateTime createTime;
}

 north-glass-erp/src/main/java/com/example/erp/mapper/sd/BasicOtherMoneyMapper.java

@@ -4,6 +4,8 @@
import com.example.erp.entity.sd.BasicOtherMoney;
import org.apache.ibatis.annotations.Mapper;

import java.util.List;

@Mapper
public interface BasicOtherMoneyMapper extends BaseMapper<BasicOtherMoney> {
}

 north-glass-erp/src/main/java/com/example/erp/mapper/sd/OrderOtherMoneyMapper.java

@@ -4,6 +4,10 @@
import com.example.erp.entity.sd.OrderOtherMoney;
import org.apache.ibatis.annotations.Mapper;

import java.util.List;

@Mapper
public interface OrderOtherMoneyMapper extends BaseMapper<OrderOtherMoney> {

    List<OrderOtherMoney> findById(String id);
}

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

@@ -190,9 +190,11 @@
    public Map<String,Object> getOrderById(String id) {
        Order order = orderMapper.selectOne(new QueryWrapper<Order>().eq("order_id",id));
        List<OrderDetail> orderDetails = orderDetailMapper.selectList(new QueryWrapper<OrderDetail>().eq("order_id",id));
        List<OrderOtherMoney> orderOtherMoneyList = orderOtherMoneyMapper.findById(id);
        Map<String,Object> map = new HashMap<>();
        map.put("order",order);
        map.put("orderDetails",orderDetails);
        map.put("orderOtherMoneyList",orderOtherMoneyList);
        return map;
    }
    //订单审核

 north-glass-erp/src/main/resources/mapper/sd/BasicDataMapper.xml

 north-glass-erp/src/main/resources/mapper/sd/BasicGlassTypeMapper.xml

 north-glass-erp/src/main/resources/mapper/sd/BasicOtherMoneyMapper.xml

New file
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.example.erp.mapper.sd.BasicOtherMoneyMapper">


</mapper>

 north-glass-erp/src/main/resources/mapper/sd/CustomerMapper.xml

 north-glass-erp/src/main/resources/mapper/sd/DeliveryDetailMapper.xml

 north-glass-erp/src/main/resources/mapper/sd/DeliveryMapper.xml

 north-glass-erp/src/main/resources/mapper/sd/OrderDetailMapper.xml

 north-glass-erp/src/main/resources/mapper/sd/OrderOtherMoneyMapper.xml

New file
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.example.erp.mapper.sd.OrderOtherMoneyMapper">
    <select id="findById">
        select
            a.*,
            b.alias
        from order_other_money as a
        left join  basic_other_money as b
        on a.`column` = b.`column`
    </select>


</mapper>

 north-glass-erp/src/main/resources/mapper/sd/OrderProcessDetailMapper.xml

 north-glass-erp/src/main/resources/mapper/sd/ProductDetailMapper.xml

 north-glass-erp/src/main/resources/mapper/sd/ProductMapper.xml

 north-glass-erp/target/classes/mapper/sd/BasicData.xml

File was deleted

 north-glass-erp/target/classes/mapper/sd/BasicGlassType.xml

File was deleted

 north-glass-erp/target/classes/mapper/sd/Customer.xml

File was deleted

 north-glass-erp/target/classes/mapper/sd/Delivery.xml

File was deleted

 north-glass-erp/target/classes/mapper/sd/DeliveryDetail.xml

File was deleted

 north-glass-erp/target/classes/mapper/sd/OrderDetail.xml

File was deleted

 north-glass-erp/target/classes/mapper/sd/OrderProcessDetail.xml

File was deleted

 north-glass-erp/target/classes/mapper/sd/Product.xml

File was deleted

 north-glass-erp/target/classes/mapper/sd/ProductDetail.xml

File was deleted

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

Binary files differ

 north-glass-erp/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -10,6 +10,7 @@
com\example\erp\service\pp\ReplenishService.class
com\example\erp\entity\sd\OrderDetail.class
com\example\erp\config\MyCorsConfig$1.class
com\example\erp\controller\sd\BasicOtherMoneyController.class
com\example\erp\controller\pp\ProductionSchedulingController.class
com\example\erp\service\sd\OrderProcessDetailService.class
com\example\erp\entity\mm\MaterialOutboundDetail.class
@@ -20,11 +21,13 @@
com\example\erp\mapper\mm\FinishedGoodsInventoryMapper.class
com\example\erp\service\IOrderService.class
com\example\erp\service\pp\ReportingWorkService.class
com\example\erp\tools\DownExcel.class
com\example\erp\mapper\sd\BasicDateMapper.class
com\example\erp\controller\pp\ReplenishController.class
com\example\erp\mapper\sd\OrderGlassDetailMapper.class
com\example\erp\entity\pp\WorkprogressMonthlySettlement.class
com\example\erp\entity\mm\FinishedGoodsInventory.class
com\example\erp\entity\sd\BasicOtherMoney.class
com\example\erp\mapper\sd\DeliveryDetailMapper.class
com\example\erp\config\MybatisPlusConfig.class
com\example\erp\entity\mm\BasicWarehouseType.class
@@ -35,6 +38,7 @@
com\example\erp\mapper\sd\OrderMapper.class
com\example\erp\controller\pp\ReportController.class
com\example\erp\service\mm\BasicWarehouseTypeService.class
com\example\erp\entity\sd\OrderOtherMoney.class
com\example\erp\mapper\OrderTestMapper.class
com\example\erp\mapper\mm\MaterialStoreMapper.class
com\example\erp\service\pp\ProductionSchedulingService.class
@@ -99,6 +103,7 @@
com\example\erp\entity\pp\ReportingWork.class
com\example\erp\tools\netty\MyWebSocketHandler.class
com\example\erp\entity\mm\MaterialOutbound.class
com\example\erp\mapper\sd\OrderOtherMoneyMapper.class
com\example\erp\controller\sd\OrderController.class
com\example\erp\mapper\pp\ReportMapper.class
com\example\erp\entity\pp\BasicDataProduce.class
@@ -108,6 +113,7 @@
com\example\erp\controller\sd\CustomerController.class
com\example\erp\entity\pp\ProductionScheduling.class
com\example\erp\common\CacheUtil.class
com\example\erp\service\sd\BasicOtherMoneyService.class
com\example\erp\entity\pp\OrderBom.class
com\example\erp\mapper\sd\DeliveryMapper.class
com\example\erp\controller\mm\BasicWarehouseTypeController.class
@@ -127,6 +133,7 @@
com\example\erp\entity\pp\Device.class
com\example\erp\tools\WebSocketServerPool.class
com\example\erp\controller\OrderTestController.class
com\example\erp\mapper\sd\BasicOtherMoneyMapper.class
com\example\erp\mapper\userInfo\SysMenuMapper.class
com\example\erp\tools\TokenTools.class
com\example\erp\controller\mm\MaterialStoreController.class

 north-glass-erp/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -50,6 +50,7 @@
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\controller\pp\ProductionSchedulingController.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\mm\FinishedOperateLogMapper.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\pp\FlowCardMapper.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\controller\sd\BasicOtherMoneyController.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\tools\TokenTools.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\controller\mm\MaterialInventoryController.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\controller\pp\ReportWorkController.java
@@ -62,6 +63,7 @@
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\service\pp\FlowCardService.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\service\pp\ReworkService.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\OrderTest.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\sd\OrderOtherMoney.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\service\pp\ReportWorkService.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\sd\BasicDateMapper.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\controller\sd\OrderController.java
@@ -85,6 +87,7 @@
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\userInfo\SysError.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\exception\ServiceException.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\tools\netty\MyChannelHandlerPool.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\sd\BasicOtherMoney.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\config\InterceptorConfig.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\pp\BasicDataProduce.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\service\sd\BasicGlassTypeServise.java
@@ -108,11 +111,13 @@
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\pp\ReportMapper.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\controller\mm\FinishedGoodsInventoryController.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\service\userInfo\UserService.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\sd\BasicOtherMoneyMapper.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\sd\BasicGlassTypeMapper.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\common\Constants.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\pp\ReportingWorkMapper.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\pp\PatchLogMapper.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\userInfo\SysErrorMapper.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\tools\DownExcel.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\sd\DeliveryDetail.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\controller\mm\BasicWarehouseTypeController.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\pp\DamageDetailsMapper.java
@@ -121,6 +126,7 @@
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\pp\DamageDetails.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\sd\ReturnsDetail.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\ErpApplication.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\sd\OrderOtherMoneyMapper.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\config\WebSocketConfig.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\controller\pp\BasicDataProduceController.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\pp\BasicDateProduceMapper.java
@@ -134,6 +140,7 @@
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\sd\OrderProcessDetail.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\mm\BasicWarehouseType.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\controller\pp\ReplenishController.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\service\sd\BasicOtherMoneyService.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\controller\sd\CustomerController.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\pp\DeviceMaintenanceMapper.java
D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\exception\GlobalExceptionHandle.java