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

chenlu

2025-07-06 74d2e2158ca037e30f414886056b5ac65d690ae6

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

 north-glass-erp/northglass-erp/src/components/mm/PrintPackingListLuoyang.vue

@@ -21,6 +21,7 @@
const user=userInfo()
const name1=ref("admin")
const name2=ref("admin")
let corporateName = ref("洛阳北方玻璃技术股份有限公司")

const data = ref({
  printList: []
@@ -77,7 +78,7 @@
                  <div style="width: 60px;height: 60px"><img id="img-pic" style="width:100%;height: 100%" src="@/assets/northGlass.ico" alt=""></div>
                </td>
                <td colspan="4" style="font-weight: bolder">
                  <div style="font-size: 18px;font-weight: bold;line-height: 15px;">洛阳北方玻璃技术股份有限公司<br>
                  <div style="font-size: 18px;font-weight: bold;line-height: 15px;"><input class="contactNumber" style="width: 60%;font-size: 18px;font-weight: bold;line-height: 15px;" type="text"    v-model="corporateName"/><br>
                    <span style="font-size: 8px;">&nbsp;&nbsp;&nbsp;&nbsp;LUOYANGNORTHGLASSTECHNOLOGYCO.,LTD.</span>
                  </div>
                </td>

 north-glass-erp/northglass-erp/src/components/mm/materialOutbound/PrintSheet1.vue

@@ -24,7 +24,7 @@
let materialStore= ref([])
const getData = () => {
  console.log(props.materialOutboundId)
  request.get(`/MaterialInventory/printCreateOutbound/${props.materialOutboundId}`).then(res => {
  request.get(`/materialInventory/printCreateOutbound/${props.materialOutboundId}`).then(res => {
    createOutbound.value=res.data.createOutbound
    createOutboundDetail.value=res.data.createOutboundDetail
    console.log(createOutbound.value)

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

@@ -37,6 +37,7 @@
        flowCardMerge: 0,//流程卡合片打印，1合并，其他不合并
        printBtn:0,//打印界面三个按钮中是否显示标签打印相关按钮，0显示，1其它不显示
        printNumber:true,//多选订单打印流程卡是否显示右上角序号义乌false,其它true
        materialOutboundColor:false,//库存查询入库超过一定时间改变颜色，洛阳true，其他false
        //天津
        printLabel: {
            custom: (item1) => {

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

@@ -37,6 +37,7 @@
        flowCardMerge: 1,//流程卡合片打印，1合并，其他不合并
        printBtn:0,//打印界面三个按钮中是否显示标签打印相关按钮，0显示常州，1天津其它不显示
        printNumber:true,//多选订单打印流程卡是否显示右上角序号义乌false,其它true
        materialOutboundColor:false,//库存查询入库超过一定时间改变颜色，洛阳true，其他false
        //天津
        printLabel: {
            custom: (item1) => {

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

@@ -37,6 +37,7 @@
        flowCardMerge: 0,//流程卡合片打印，1合并，其他不合并
        printBtn:1,//打印界面三个按钮中是否显示标签打印相关按钮，0显示常州，1天津其它不显示
        printNumber:true,//多选订单打印流程卡是否显示右上角序号义乌false,其它true
        materialOutboundColor:false,//库存查询入库超过一定时间改变颜色，洛阳true，其他false
        //天津
        printLabel: {
            custom: (item1) => {

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

@@ -38,6 +38,7 @@
        deliveryOutbound: false,//发货默认出库
        flowCardMerge: 0,//流程卡合片打印
        printBtn:1,//打印界面三个按钮中是否显示标签打印相关按钮，0显示常州，1天津其它不显示
        materialOutboundColor:true,//库存查询入库超过一定时间改变颜色，洛阳true，其他false
        //天津
        printLabel: {
            custom: (item1) => {

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

@@ -39,6 +39,7 @@
        flowCardMerge: 0,//流程卡合片打印，1合并，其他不合并
        printBtn:1,//打印界面三个按钮中是否显示标签打印相关按钮，0显示常州，1天津其它不显示
        printNumber:true,//多选订单打印流程卡是否显示右上角序号义乌false,其它true
        materialOutboundColor:false,//库存查询入库超过一定时间改变颜色，洛阳true，其他false
        //天津
        printLabel: {
            custom: (item1) => {

 north-glass-erp/northglass-erp/src/views/mm/ingredientStock/CreateOutBound.vue

@@ -66,6 +66,8 @@
  materialRequisitionPersonnel:'',
  materialRequisitionTeam:'',
  orderId:'',
  project:'',
  batch:'',
  materialRequisitionDate:'',
  reviewedState:'',
  reviewed:'',
@@ -507,6 +509,28 @@
})


const getproject = () =>  {
  if(titleUploadData.value.orderId!==''){
    request.post(`/order/getOrderById/` +titleUploadData.value.orderId ).then((res) => {
      if (res.code == 200) {
        if(res.data.order!=null){
          titleUploadData.value.project=res.data.order.project
          titleUploadData.value.batch=res.data.order.batch
        }else{
          titleUploadData.value.project=''
          titleUploadData.value.batch=''
        }

      } else {
        ElMessage.warning(res.msg)
      }
    })
  }

}




</script>

@@ -520,9 +544,6 @@
      <el-col  :span="3"><el-input v-model="titleUploadData.materialRequisitionPersonnel" /></el-col>
      <el-col  :span="2"><el-text>{{$t('ingredientsStock.materialRequisitionTeam')}}:</el-text></el-col>
      <el-col  :span="3"><el-input v-model="titleUploadData.materialRequisitionTeam" /></el-col>

    </el-row>
    <el-row>
      <el-col  :span="2"><el-text>{{$t('ingredientsStock.outboundType')}}：</el-text></el-col>
      <el-col  :span="3">
        <el-select v-model="titleUploadData.outboundType"  clearable placeholder=""  >
@@ -534,11 +555,17 @@
          />
        </el-select>
      </el-col>
      <el-col  :span="2"><el-text>{{$t('order.orderId')}}:</el-text></el-col>
      <el-col  :span="3"><el-input v-model="titleUploadData.orderId" /></el-col>

    </el-row>
    <el-row>
      <el-col  :span="2"><el-text>{{$t('ingredientsStock.warehouseManager')}}:</el-text></el-col>
      <el-col  :span="3"><el-input v-model="titleUploadData.warehouseManager" :readonly="true" /></el-col>

      <el-col  :span="2"><el-text>{{$t('order.orderId')}}:</el-text></el-col>
      <el-col  :span="3"><el-input  @blur="getproject"  v-model="titleUploadData.orderId" /></el-col>
      <el-col  :span="2"><el-text>{{$t('order.project')}}:</el-text></el-col>
      <el-col  :span="3"><el-input v-model="titleUploadData.project" /></el-col>
      <el-col  :span="2"><el-text>{{$t('order.batch')}}:</el-text></el-col>
      <el-col  :span="3"><el-input v-model="titleUploadData.batch" /></el-col>
    </el-row>
  </div>


 north-glass-erp/northglass-erp/src/views/mm/ingredientStock/MaterialOutbound.vue

@@ -226,6 +226,8 @@
    {field: 'outboundType', width: '100',title: t('ingredientsStock.outboundType'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'warehouseManager',width: '100', title: t('ingredientsStock.warehouseManager'), sortable: true,showOverflow:"ellipsis",filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'materialRequisitionDate', width: '80',title: t('ingredientsStock.materialRequisitionDate'), sortable: true},
    {field: 'project',width: '100', title: t('order.project'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'batch',width: '100', title: t('order.batch'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'reviewed',width: '100', title: t('ingredientsStock.reviewed'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'reviewedTime', width: '100',title: t('ingredientsStock.reviewedTime'), sortable: true},
    {field: 'createTime',width: '100', title: t('basicData.creationTime'), sortable: true},

 north-glass-erp/northglass-erp/src/views/mm/ingredientStock/SelectIngredientsStock.vue

@@ -11,10 +11,12 @@
import {toolbarButtonClickEvent} from "@/hook/mouseMove";
import {changeFilterEvent,filterChanged} from "@/hook"
import {divideAuto, multiply} from "@/utils/decimal";
import companyInfo from "@/stores/sd/companyInfo";

//语言获取
const { t } = useI18n()
const userStore = useUserInfoStore()
const company = companyInfo()
const router = useRouter()
let produceList = ref([])
let produceLists = ref([])
@@ -691,6 +693,36 @@
}


const rowStyle = ({ row,rowIndex  }) => {
  if(company.materialOutboundColor){
    let date = new Date();
    let date1=new Date();
    let date2=new Date();
    date1.setMonth(date.getMonth()-3);
    date2.setMonth(date.getMonth()-6);

    const date3=new Date(row.createTime);

    const diff = date1.getTime() - date2.getTime();
    const diffInDays = diff / (1000 * 60 * 60 * 24);
    if(date3>=date1){
      return {
        backgroundColor: '#ffffff',
      }
    }else if(date3>=date2&&date1>date3){
      return {
        backgroundColor: '#e0e7c8',
      }
    }else{
      return {
        backgroundColor: '#afa7ab',
      }
    }
  }

}


</script>

<template>
@@ -727,6 +759,7 @@
          ref="xGrid"
          v-bind="gridOptions"
          v-on="gridEvents"
          :row-style="rowStyle"

      >
        <!--      @toolbar-button-click="toolbarButtonClickEvent"-->

 north-glass-erp/northglass-erp/src/views/mm/productStock/CreateProductStock.vue

@@ -9,10 +9,11 @@
import {ElMessage} from "element-plus";
import { useI18n } from 'vue-i18n'
import footSum from "@/hook/footSum";
import companyInfo from "@/stores/sd/companyInfo";

//语言获取
const { t } = useI18n()

const company = companyInfo()
const userStore = useUserInfoStore()
const username = userStore.user.userName
const userid = userStore.user.userId
@@ -275,6 +276,7 @@
              return
            }
            let flowData = ref({
              decValue:company.decValue,
              userId: userid,
              userName: username,
              storageRegion: storageRegion.value,

 north-glass-erp/northglass-erp/src/views/mm/productStock/ProductStockList.vue

@@ -225,6 +225,7 @@
    /*import: false,
   export: true,
   print: true,*/
    export: true,
    zoom: true,
    custom: true
  },

 north-glass-erp/northglass-erp/src/views/mm/productStock/StorageRecord.vue

@@ -10,11 +10,13 @@
import {Search} from "@element-plus/icons-vue";
import { useI18n } from 'vue-i18n'
import footSum from "@/hook/footSum";
import companyInfo from "@/stores/sd/companyInfo";

//语言获取
const { t } = useI18n()
const router = useRouter()
const route = useRoute()

const userStore = useUserInfoStore()
const username = userStore.user.userName
const userid = userStore.user.userId
@@ -215,6 +217,10 @@
    {field: 'orderDetail.productName',width: '140', title: t('order.product'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'orderDetail.width', width: '100',title: t('order.width'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'orderDetail.height',width: '100', title: t('order.height'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'area',width: '100', title: t('order.trueArea'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'money',width: '100', title: t('order.grossAmount'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'order.project',width: '100', title: t('order.project'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'order.customerName',width: '100', title: t('order.customers'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'operator', width: '100',title: t('productStock.creator'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'operateTime', width:'140', title: t('productStock.productionDate'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'reviewed', width: '100',title: t('productStock.reviewed'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
@@ -234,6 +240,7 @@
    /*import: false,
   export: true,
   print: true,*/
    export: true,
    zoom: true,
    custom: true
  },

 north-glass-erp/src/main/java/com/example/erp/entity/mm/FinishedOperateLog.java

@@ -31,6 +31,9 @@
    private String remarks;
    private String processId;

    private Double area;
    private Double money;

    private OrderDetail orderDetail;

    private Order order;

 north-glass-erp/src/main/java/com/example/erp/entity/mm/MaterialOutbound.java

@@ -22,6 +22,8 @@
    private LocalDate reviewedTime;
    private Integer reviewedState;
    private LocalDate createTime;
    private String project;
    private String batch;




 north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedOperateLogMapper.java

@@ -17,7 +17,9 @@
public interface FinishedOperateLogMapper extends CrudRepository<FinishedOperateLog,Long> {
    FinishedOperateLog getselectFinishedOperateLog();

    Boolean insertIntFinishedOperateLog(@Param("flowCard") FlowCard flowCard ,@Param("userName") String userName,@Param("oddNumber") String oddNumber,@Param("container") String container);
    Boolean insertIntFinishedOperateLog(@Param("flowCard") FlowCard flowCard ,@Param("userName") String userName,
                                        @Param("oddNumber") String oddNumber,@Param("container") String container,
                                        @Param("deliveryDetailMoney") Double deliveryDetailMoney,@Param("deliveryDetailArea") Double deliveryDetailArea);

    Boolean insertOutFinishedOperateLog(@Param("orderDetail") OrderDetail orderDetail,@Param("userName") String userName,@Param("oddNumber") String oddNumber);


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

@@ -26,6 +26,8 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;

import java.math.BigDecimal;
import java.math.RoundingMode;
import java.sql.SQLException;
import java.sql.Wrapper;
import java.text.SimpleDateFormat;
@@ -77,6 +79,7 @@
            String storageRegion = "";
            String remark = "";
            String container = "";
            int decValue = 0;
            if (object.get("remark") != null) {
                remark = object.get("remark").toString();
            }
@@ -95,6 +98,9 @@
            if (object.get("userId") != null) {
                userId = object.get("userId").toString();
            }
            if (object.get("decValue") != null) {
                decValue = Integer.parseInt(object.get("decValue").toString());
            }
            Log log = new Log();
            log.setOperator(userName);
            log.setOperatorId(userId);
@@ -108,8 +114,51 @@
                //获取单号
                String oddNumber= orderNumberSetting("入库");
                for (FlowCard flowCard : flowCardlist) {

                    Integer calculateType=flowCard.getOrder().getCalculateType();
                    double deliveryDetailMoney = 0.0;
                    double deliveryDetailArea = 0.0;
                    BigDecimal getComputeArea= BigDecimal.valueOf(flowCard.getOrderDetail().getComputeArea());
                    BigDecimal getQuantity= BigDecimal.valueOf(flowCard.getInventoryQuantity());
                    BigDecimal getPrice= BigDecimal.valueOf(flowCard.getOrderDetail().getPrice());
                    BigDecimal getWidth= BigDecimal.valueOf(flowCard.getOrderDetail().getWidth());
                    BigDecimal getHeight= BigDecimal.valueOf(flowCard.getOrderDetail().getHeight());
                    BigDecimal singlePieceArea =getComputeArea.multiply(getQuantity).setScale(decValue, RoundingMode.HALF_UP)
                            .multiply(getPrice).setScale(2, RoundingMode.HALF_UP);
                    //根据订单计算方式进行金额计算
                    if (calculateType==1){
                        deliveryDetailMoney=singlePieceArea.doubleValue();
                        deliveryDetailArea=getComputeArea.multiply(getQuantity).doubleValue();

                    }else if (calculateType==2){
                        //判断实际单片面积跟结算单片面积是否相等 ç»“算总面积跟实际总面积是否相等
                        if(Objects.equals(flowCard.getOrderDetail().getArea(), flowCard.getOrderDetail().getComputeArea())&&Objects.equals(flowCard.getOrderDetail().getGrossArea(), flowCard.getOrderDetail().getComputeGrossArea())){
                            deliveryDetailMoney=getWidth.multiply(getHeight).multiply(getQuantity).divide(BigDecimal.valueOf(1000000), decValue, RoundingMode.HALF_UP)
                                    .multiply(getPrice).setScale(2, RoundingMode.HALF_UP).doubleValue();
                            deliveryDetailArea=getWidth.multiply(getHeight).multiply(getQuantity).divide(BigDecimal.valueOf(1000000), decValue, RoundingMode.HALF_UP).doubleValue();
                        }else{
                            deliveryDetailMoney=singlePieceArea.doubleValue();
                            deliveryDetailArea=getComputeArea.multiply(getQuantity).doubleValue();
                        }
                    }else if (calculateType==3){
                        deliveryDetailMoney=getQuantity.multiply(getPrice).setScale(2, RoundingMode.HALF_UP).doubleValue();
                        deliveryDetailArea=getComputeArea.multiply(getQuantity).doubleValue();

                    }else if (calculateType==4){
                        //判断实际单片面积跟结算单片面积是否相等 ç»“算总面积跟实际总面积是否相等
                        if(Objects.equals(flowCard.getOrderDetail().getArea(), flowCard.getOrderDetail().getComputeArea())&&Objects.equals(flowCard.getOrderDetail().getGrossArea(), flowCard.getOrderDetail().getComputeGrossArea())){
                            deliveryDetailMoney=getWidth.multiply(getHeight).multiply(getQuantity).multiply(getPrice).
                                    divide(BigDecimal.valueOf(1000000), 2, RoundingMode.HALF_UP).doubleValue();
                            deliveryDetailArea=getWidth.multiply(getHeight).multiply(getQuantity).divide(BigDecimal.valueOf(1000000), decValue, RoundingMode.HALF_UP).doubleValue();
                        }else{
                            deliveryDetailMoney=getComputeArea.multiply(getQuantity).multiply(getPrice).setScale(decValue, RoundingMode.HALF_UP).doubleValue();
                            deliveryDetailArea=getComputeArea.multiply(getQuantity).doubleValue();
                        }
                    }


                    //添加出入库记录
                    finishedOperateLogMapper.insertIntFinishedOperateLog(flowCard,userName,oddNumber,container);
                    finishedOperateLogMapper.insertIntFinishedOperateLog(flowCard,userName,oddNumber,container,deliveryDetailMoney,deliveryDetailArea);
                    Integer finishedGoodsInventorycount = finishedGoodsInventoryMapper.findOrderNumberdcount(flowCard.getOrder().getOrderId(),flowCard.getOrderNumber());
                    Integer ordersum = finishedGoodsInventoryMapper.findOrderQuantity(flowCard.getOrder().getOrderId());
                    Integer ordernumbersum = finishedGoodsInventoryMapper.findOrderNumberdsum(flowCard.getOrder().getOrderId());

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

@@ -46,6 +46,7 @@
        <result column="area" property="order.area"/>
        <result column="batch" property="order.batch"/>
        <result column="order_quantity" property="order.quantity"/>
        <result column="calculate_type" property="order.calculateType"/>

        <result column="building_number" property="orderDetail.buildingNumber"/>
        <result column="width" property="orderDetail.width"/>
@@ -53,6 +54,12 @@
        <result column="product_name" property="orderDetail.productName"/>
        <result column="product_id" property="orderDetail.productId"/>
        <result column="quantity" property="orderDetail.quantity"/>

        <result column="price" property="orderDetail.price"/>
        <result column="areas" property="orderDetail.area"/>
        <result column="gross_area" property="orderDetail.grossArea"/>
        <result column="compute_area" property="orderDetail.computeArea"/>
        <result column="compute_gross_area" property="orderDetail.computeGrossArea"/>
    </resultMap>

    <!--映射成品出库-->
@@ -587,7 +594,13 @@
        o.area,
        fc.process_id,
        fc.received_quantity,
        o.batch
        o.batch,
        o.calculate_type,
        od.compute_area,
        od.price,
        od.area as areas,
        od.gross_area,
        od.compute_gross_area
        from (select *,min(inventory_quantity) as min_inventory_quantity from pp.flow_card  group by  order_id,order_number,process_id) as fc
        left join sd.order_detail od on fc.order_id=od.order_id and fc.order_number=od.order_number inner join sd.`order` o on
        o.order_id=fc.order_id

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

@@ -21,6 +21,8 @@
        <result column="remarks" property="remarks"/>
        <result column="is_state" property="isState"/>
        <result column="process_id" property="processId"/>
        <result column="money" property="money"/>
        <result column="area" property="area"/>

        <result column="width" property="orderDetail.width"/>
        <result column="height" property="orderDetail.height"/>
@@ -30,6 +32,8 @@
        <result column="project" property="order.project"/>
        <result column="customer_name" property="order.customerName"/>
        <result column="delivery_address" property="order.deliveryAddress"/>
        <result column="project" property="order.project"/>
        <result column="customer_name" property="order.customerName"/>

    </resultMap>

@@ -52,7 +56,11 @@
        fol.reviewed,
        fol.reviewed_time,
        fol.type,
        fol.remarks
        fol.remarks,
        fol.area,
        fol.money,
        o.customer_name,
        o.project
        from (select *
        from mm.finished_operate_log aa where aa.operate_type = #{type}  and aa.status!='已作废') fol
        left join sd.order_detail od on fol.order_id = od.order_id and fol.operation_number = od.order_number
@@ -106,6 +114,18 @@
            </if>
            <if test="finishedOperateLog.remarks != null and finishedOperateLog.remarks != ''">
                and fol.remarks regexp #{finishedOperateLog.remarksr}
            </if>
            <if test="finishedOperateLog.area != null and finishedOperateLog.area != ''">
                and fol.area regexp #{finishedOperateLog.area}
            </if>
            <if test="finishedOperateLog.money != null and finishedOperateLog.money != ''">
                and fol.money regexp #{finishedOperateLog.money}
            </if>
            <if test="finishedOperateLog.order !=null and (finishedOperateLog.order.customerName != null and finishedOperateLog.order.customerName != '')">
                and o.customer_name regexp #{finishedOperateLog.order.customerName}
            </if>
            <if test="finishedOperateLog.order !=null and (finishedOperateLog.order.project != null and finishedOperateLog.order.project != '')">
                and o.project regexp #{finishedOperateLog.order.project}
            </if>
        </where>
        order by fol.operate_time desc
@@ -164,6 +184,18 @@
            </if>
            <if test="finishedOperateLog.remarks != null and finishedOperateLog.remarks != ''">
                and fol.remarks regexp #{finishedOperateLog.remarksr}
            </if>
            <if test="finishedOperateLog.area != null and finishedOperateLog.area != ''">
                and fol.area regexp #{finishedOperateLog.area}
            </if>
            <if test="finishedOperateLog.money != null and finishedOperateLog.money != ''">
                and fol.money regexp #{finishedOperateLog.money}
            </if>
            <if test="finishedOperateLog.order !=null and (finishedOperateLog.order.customerName != null and finishedOperateLog.order.customerName != '')">
                and o.customer_name regexp #{finishedOperateLog.order.customerName}
            </if>
            <if test="finishedOperateLog.order !=null and (finishedOperateLog.order.project != null and finishedOperateLog.order.project != '')">
                and o.project regexp #{finishedOperateLog.order.project}
            </if>
        </where>
        order by fol.`status` desc
@@ -574,10 +606,13 @@
                                            quantity,
                                            operate_time,
                                            status,
                                            remarks
                                            remarks,
                                            money,
                                            area
        )
        values (
                   #{oddNumber} ,#{flowCard.order.orderId},#{flowCard.processId},#{flowCard.orderNumber},"入库",#{userName},#{flowCard.inventoryQuantity},now(),"未审核",#{container}
                   #{oddNumber} ,#{flowCard.order.orderId},#{flowCard.processId},#{flowCard.orderNumber},"入库",#{userName},
                #{flowCard.inventoryQuantity},now(),"未审核",#{container},#{deliveryDetailMoney},#{deliveryDetailArea}
               )
    </insert>


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

@@ -247,6 +247,12 @@
            <if test="materialOutbound.reviewed != null and materialOutbound.reviewed != ''">
                and mo.reviewed regexp #{materialOutbound.reviewed}
            </if>
            <if test="materialOutbound.project != null and materialOutbound.project != ''">
                and mo.project regexp #{materialOutbound.project}
            </if>
            <if test="materialOutbound.batch != null and materialOutbound.batch != ''">
                and mo.batch regexp #{materialOutbound.batch}
            </if>
        </where>
        order by mo.create_time desc
        limit #{offset},#{pageSize};
@@ -280,6 +286,12 @@
            </if>
            <if test="materialOutbound.reviewed != null and materialOutbound.reviewed != ''">
                and mo.reviewed regexp #{materialOutbound.reviewed}
            </if>
            <if test="materialOutbound.project != null and materialOutbound.project != ''">
                and mo.project regexp #{materialOutbound.project}
            </if>
            <if test="materialOutbound.batch != null and materialOutbound.batch != ''">
                and mo.batch regexp #{materialOutbound.batch}
            </if>
        </where>
    </select>
@@ -612,11 +624,11 @@

    <insert id="insertMaterialOutbound"  useGeneratedKeys="true" >
        insert into mm.material_outbound(material_outbound_id,material_requisition_personnel,material_requisition_team,order_id,outbound_type,
                                         warehouse_manager,material_requisition_date,reviewed_state,create_time)
                                         warehouse_manager,material_requisition_date,reviewed_state,create_time,project,batch)
        values (
                  #{number} ,#{materialOutbound.materialRequisitionPersonnel},#{materialOutbound.materialRequisitionTeam},
                #{materialOutbound.orderId},#{materialOutbound.outboundType},#{materialOutbound.warehouseManager},#{materialOutbound.materialRequisitionDate},
                   0,now()
                   0,now(),#{materialOutbound.project},#{materialOutbound.batch}
               )
    </insert>

@@ -627,7 +639,9 @@
            order_id=#{materialOutbound.orderId},
            outbound_type=#{materialOutbound.outboundType},
            warehouse_manager=#{materialOutbound.warehouseManager},
            material_requisition_date=#{materialOutbound.materialRequisitionDate}
            material_requisition_date=#{materialOutbound.materialRequisitionDate},
            project=#{materialOutbound.project},
            batch=#{materialOutbound.batch}
        where material_outbound_id = #{number}
    </insert>