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

廖井涛

2024-02-20 149d60a12ef635c2b08e4ebedfc9afa7363a6562

 north-glass-erp/target/classes/mapper/mm/FinishedOperateLog.xml

@@ -28,6 +28,10 @@

    </resultMap>

    <update id="updateToExamine">
        update mm.finished_operate_log set reviewed=#{userName},reviewed_time=now(),status=#{type} where operation_order_number=#{finishedOperateLog.operationOrderNumber};
    </update>

    <select id="getSelectOperateRecord" resultMap="selectFinishedGoodsInventory">
        select fol.operation_order_number,
               fol.order_id,
@@ -95,7 +99,7 @@
                and fol.remarks regexp #{finishedOperateLog.remarksr}
            </if>
        </where>

        order by fol.`status` desc
        limit #{offset},#{pageSize};
    </select>

@@ -151,6 +155,7 @@
                and fol.remarks regexp #{finishedOperateLog.remarksr}
            </if>
        </where>
        order by fol.`status` desc
        limit #{offset},#{pageSize};
    </select>

@@ -279,6 +284,24 @@
               )
    </insert>

    <insert id="insertFinishedOperateLogRework"  useGeneratedKeys="true"  >
        insert into mm.finished_operate_log(operation_order_number,
                                            order_id,
                                            operation_number,
                                            operate_type,
                                            operator,
                                            quantity,
                                            operate_time,
                                            status,
                                            type,
                                            remarks
        )
        values (
                   #{oddNumber} ,#{orderDetail.finishedGoodsInventory.orderId},#{orderDetail.finishedGoodsInventory.orderNumber}
               ,"返工",#{userName},#{orderDetail.quantity},now(),"未审核",#{operateType},#{remarks}
               )
    </insert>

    <insert id="insertFinishedOperateLogAllocate"  useGeneratedKeys="true" >
        insert into mm.finished_operate_log(operation_order_number,
                                            order_id,